Removing TOUCH_UI from content renderer.

Editing description to stop CQ

BUG=105046
TEST=none

Review URL: http://codereview.chromium.org/8636001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111208 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 1 insertions, 18 deletions

diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index 7ceccd7..7562aec 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));
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 244bf8b..502bb67 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -3569,7 +3569,7 @@ void RenderViewImpl::OnZoom(content::PageZoom zoom) {
     return;
 
   webview()->hidePopups();
-#if !defined(TOUCH_UI)
+
   double old_zoom_level = webview()->zoomLevel();
   double zoom_level;
   if (zoom == content::PAGE_ZOOM_RESET) {
@@ -3591,9 +3591,6 @@ void RenderViewImpl::OnZoom(content::PageZoom zoom) {
     }
   }
   webview()->setZoomLevel(false, zoom_level);
-#else
-  ZoomFactorHelper(zoom, 0, 0, kScalingIncrement);
-#endif
   zoomLevelChanged();
 }
 
@@ -4543,12 +4540,7 @@ void RenderViewImpl::zoomLimitsChanged(double minimum_level,
 
 void RenderViewImpl::zoomLevelChanged() {
   bool remember = !webview()->mainFrame()->document().isPluginDocument();
-#if defined(TOUCH_UI)
-  float zoom_level =
-      WebView::zoomFactorToZoomLevel(webview()->pageScaleFactor());
-#else
   float zoom_level = webview()->zoomLevel();
-#endif
   // Tell the browser which url got zoomed so it can update the menu and the
   // saved values if necessary
   Send(new ViewHostMsg_DidZoomURL(