Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2183)

Unified Diff: content/renderer/render_thread_impl.cc

Issue 8636001: Removing TOUCH_UI from content renderer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove 2 files handled (better) in another CL. Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | content/renderer/render_view_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_thread_impl.cc
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index 7ceccd72cf8c93d04992f6ce1e342ab27063a3c4..7562aec4bd25faf7d75ceb26c066df7178f0de13 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -103,10 +103,6 @@ using content::RenderProcessObserver;
namespace {
static const int64 kInitialIdleHandlerDelayMs = 1000;
-#if defined(TOUCH_UI)
-static const int kPopupListBoxMinimumRowHeight = 60;
-#endif
-
// Keep the global RenderThreadImpl in a TLS slot so it is impossible to access
// incorrectly from the wrong thread.
static base::LazyInstance<base::ThreadLocalPointer<RenderThreadImpl> >
@@ -515,12 +511,7 @@ void RenderThreadImpl::EnsureWebKitInitialized() {
WebRuntimeFeatures::enablePushState(true);
-#ifdef TOUCH_UI
- WebRuntimeFeatures::enableTouch(true);
- WebKit::WebPopupMenu::setMinimumRowHeight(kPopupListBoxMinimumRowHeight);
-#else
WebRuntimeFeatures::enableTouch(false);
-#endif
WebRuntimeFeatures::enableDeviceMotion(
command_line.HasSwitch(switches::kEnableDeviceMotion));
« no previous file with comments | « no previous file | content/renderer/render_view_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698