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
committerPierre Rossi <pierre.rossi@gmail.com>2014-04-09 01:25:57 +0200
commitf4cdc8d8920e1eb96ccae5cab41eb9e39664164d (patch)
tree6027ce492e17d9d49ef1559a95b45bd2bb2d7252 /chromium/content/renderer/render_thread_impl.cc
parentb3c9bb0a1f3eae80103ddcd84b57caf6843ae174 (diff)
downloadqtwebengine-chromium-f4cdc8d8920e1eb96ccae5cab41eb9e39664164d.tar.gz
[Mac] 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. Change-Id: Iefe1dd3b246fc210ac18ff9eb0e7ad498c061eac Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@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