diff options
| -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 6988bc5e590..871035c755b 100644 --- a/chromium/content/browser/browser_main_loop.cc +++ b/chromium/content/browser/browser_main_loop.cc @@ -1126,7 +1126,7 @@ int BrowserMainLoop::CreateThreads() { LOG(FATAL) << "Failed to start the browser thread: id == " << id; } else { scoped_refptr<base::SingleThreadTaskRunner> redirection_task_runner; -#if defined(OS_WIN) +#if defined(OS_WIN) && !defined(TOOLKIT_QT) // On Windows, the FILE thread needs to have a UI message loop which // pumps messages in such a way that Google Update can communicate back // to us. The COM STA task runner provides this service. diff --git a/chromium/content/browser/gpu/gpu_process_host.cc b/chromium/content/browser/gpu/gpu_process_host.cc index 6b0b7066af7..5bc1f1d6c89 100644 --- a/chromium/content/browser/gpu/gpu_process_host.cc +++ b/chromium/content/browser/gpu/gpu_process_host.cc @@ -622,7 +622,7 @@ bool GpuProcessHost::Init() { process_->GetInProcessBrokerClientInvitation(), process_->child_connection()->service_token()))); 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 bbd8194a4ff..05169d2a94a 100644 --- a/chromium/content/browser/renderer_host/render_process_host_impl.cc +++ b/chromium/content/browser/renderer_host/render_process_host_impl.cc @@ -1132,7 +1132,7 @@ bool RenderProcessHostImpl::Init() { child_connection_->service_token()))); 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 |