summaryrefslogtreecommitdiff
path: root/chromium/content/renderer/render_thread_impl.cc
diff options
context:
space:
mode:
authorPierre Rossi <pierre.rossi@digia.com>2014-04-03 12:18:16 +0200
committerAndras Becsi <andras.becsi@digia.com>2014-06-04 18:13:42 +0200
commit4cc2665926faa1ec627da1985def3c62b93e1973 (patch)
treece6b657e6c8b1a6af69e8dba5289c28fb6c6767f /chromium/content/renderer/render_thread_impl.cc
parentc0273ea019f2f0c8096f6202770ff47e1da8b8bc (diff)
downloadqtwebengine-chromium-4cc2665926faa1ec627da1985def3c62b93e1973.tar.gz
<chromium> fixup select elements.
We use RenderWidgetHostViewQt, not RWHVMac, even on Mac. Since some platform decisions seem to have transpired all the way to the content layer, we should simply use the web ui for select elements on mac for the time being. Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com> Change-Id: Ib430f8686862cf0958ccdbfefb8bfa36af590e97 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'chromium/content/renderer/render_thread_impl.cc')
-rw-r--r--chromium/content/renderer/render_thread_impl.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chromium/content/renderer/render_thread_impl.cc b/chromium/content/renderer/render_thread_impl.cc
index e910b8bf80d..609b965f468 100644
--- a/chromium/content/renderer/render_thread_impl.cc
+++ b/chromium/content/renderer/render_thread_impl.cc
@@ -314,7 +314,7 @@ void RenderThreadImpl::Init() {
v8::V8::SetCreateHistogramFunction(CreateHistogram);
v8::V8::SetAddHistogramSampleFunction(AddHistogramSample);
-#if defined(OS_MACOSX) || defined(OS_ANDROID)
+#if (defined(OS_MACOSX) || defined(OS_ANDROID)) && !defined(TOOLKIT_QT)
// On Mac and Android, the select popups are rendered by the browser.
blink::WebView::setUseExternalPopupMenus(true);
#endif