diff --git a/chromium/build/common.gypi b/chromium/build/common.gypi index 4c76aace6cf899e113f97a29872bec5a33f0fd24..05da9b5f48d7470cdd6130bff0dcc76e8a292211 100644 --- a/chromium/build/common.gypi +++ b/chromium/build/common.gypi @@ -5081,7 +5081,7 @@ '_SECURE_ATL', ], }], - ['msvs_express', { + ['msvs_express and use_qt==0', { 'configurations': { 'x86_Base': { 'msvs_settings': { diff --git a/chromium/content/app/content_main_runner.cc b/chromium/content/app/content_main_runner.cc index 38bf1cb326089324cd6fe4b152ddad8e02f4655f..5db69619305cd9cf13fc3e40cbc23a4b9e2c9ec8 100644 --- a/chromium/content/app/content_main_runner.cc +++ b/chromium/content/app/content_main_runner.cc @@ -77,7 +77,9 @@ #include <cstring> #include "base/strings/string_number_conversions.h" +#if !defined(TOOLKIT_QT) #include "ui/base/win/atl_module.h" +#endif #include "ui/base/win/dpi_setup.h" #include "ui/gfx/win/dpi.h" #elif defined(OS_MACOSX) @@ -481,7 +483,9 @@ class ContentMainRunnerImpl : public ContentMainRunner { #if defined(OS_WIN) RegisterInvalidParamHandler(); +#if !defined(TOOLKIT_QT) ui::win::CreateATLModuleIfNeeded(); +#endif sandbox_info_ = *params.sandbox_info; #else // !OS_WIN diff --git a/chromium/content/browser/accessibility/browser_accessibility_manager.cc b/chromium/content/browser/accessibility/browser_accessibility_manager.cc index 6bdce2d907a503186a04788d2ba7731723866923..85ddee46783354671c23831a1678a0639cb115e7 100644 --- a/chromium/content/browser/accessibility/browser_accessibility_manager.cc +++ b/chromium/content/browser/accessibility/browser_accessibility_manager.cc @@ -45,7 +45,11 @@ ui::AXTreeUpdate MakeAXTreeUpdate( } BrowserAccessibility* BrowserAccessibilityFactory::Create() { +#if !defined(TOOLKIT_QT) return BrowserAccessibility::Create(); +#else + return 0; +#endif } #if !defined(OS_MACOSX) && \ diff --git a/chromium/content/browser/webui/content_web_ui_controller_factory.cc b/chromium/content/browser/webui/content_web_ui_controller_factory.cc index 485e95cd0c193d2e8d53a1259251a9429681102c..fd5c11830ae31b72f3b026399b63b39c2be68e7b 100644 --- a/chromium/content/browser/webui/content_web_ui_controller_factory.cc +++ b/chromium/content/browser/webui/content_web_ui_controller_factory.cc @@ -55,8 +55,10 @@ WebUIController* ContentWebUIControllerFactory::CreateWebUIControllerForURL( return new IndexedDBInternalsUI(web_ui); if (url.host() == kChromeUIMediaInternalsHost) return new MediaInternalsUI(web_ui); +#if !defined(TOOLKIT_QT) if (url.host() == kChromeUIAccessibilityHost) return new AccessibilityUI(web_ui); +#endif if (url.host() == kChromeUIServiceWorkerInternalsHost) return new ServiceWorkerInternalsUI(web_ui); #if !defined(OS_ANDROID) && !defined(TOOLKIT_QT)