diff options
Diffstat (limited to 'chromium/content/browser')
| -rw-r--r-- | chromium/content/browser/browser_main_loop.cc | 2 | ||||
| -rw-r--r-- | chromium/content/browser/gpu/gpu_process_host.cc | 2 | ||||
| -rw-r--r-- | chromium/content/browser/renderer_host/render_process_host_impl.cc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/chromium/content/browser/browser_main_loop.cc b/chromium/content/browser/browser_main_loop.cc index 456bc14ece3..052a87c30ae 100644 --- a/chromium/content/browser/browser_main_loop.cc +++ b/chromium/content/browser/browser_main_loop.cc @@ -802,7 +802,7 @@ int BrowserMainLoop::CreateThreads() { "BrowserMainLoop::CreateThreads:start", "Thread", "BrowserThread::FILE"); thread_to_start = &file_thread_; -#if defined(OS_WIN) +#if defined(OS_WIN) && !defined(TOOLKIT_QT) // On Windows, the FILE thread needs to be have a UI message loop // which pumps messages in such a way that Google Update can // communicate back to us. diff --git a/chromium/content/browser/gpu/gpu_process_host.cc b/chromium/content/browser/gpu/gpu_process_host.cc index 5ad53405fac..54b37e8158b 100644 --- a/chromium/content/browser/gpu/gpu_process_host.cc +++ b/chromium/content/browser/gpu/gpu_process_host.cc @@ -513,7 +513,7 @@ bool GpuProcessHost::Init() { g_gpu_main_thread_factory(InProcessChildThreadParams( channel_id, base::MessageLoop::current()->task_runner()))); base::Thread::Options options; -#if defined(OS_WIN) +#if defined(OS_WIN) && !defined(TOOLKIT_QT) // WGL needs to create its own window and pump messages on it. options.message_loop_type = base::MessageLoop::TYPE_UI; #endif diff --git a/chromium/content/browser/renderer_host/render_process_host_impl.cc b/chromium/content/browser/renderer_host/render_process_host_impl.cc index f0f19963ff6..dbf2b45c833 100644 --- a/chromium/content/browser/renderer_host/render_process_host_impl.cc +++ b/chromium/content/browser/renderer_host/render_process_host_impl.cc @@ -645,7 +645,7 @@ bool RenderProcessHostImpl::Init() { BrowserThread::IO)->task_runner()))); base::Thread::Options options; -#if defined(OS_WIN) && !defined(OS_MACOSX) +#if defined(OS_WIN) && !defined(OS_MACOSX) && !defined(TOOLKIT_QT) // In-process plugins require this to be a UI message loop. options.message_loop_type = base::MessageLoop::TYPE_UI; #else |