Removing TOUCH_UI from content renderer

content/renderer/render_view_impl.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/render_view_impl.h"
 
 #include <algorithm>
 #include <cmath>
 #include <string>
 #include <vector>
@@ skipping 3551 matching lines @@
     // Send the search result over to the browser process.
     Send(queued_find_reply_message_.release());
   }
 }
 
 void RenderViewImpl::OnZoom(content::PageZoom zoom) {
   if (!webview())  // Not sure if this can happen, but no harm in being safe.
     return;
 
   webview()->hidePopups();
-#if !defined(TOUCH_UI)
+
   double old_zoom_level = webview()->zoomLevel();
   double zoom_level;
   if (zoom == content::PAGE_ZOOM_RESET) {
     zoom_level = 0;
   } else if (static_cast<int>(old_zoom_level) == old_zoom_level) {
     // Previous zoom level is a whole number, so just increment/decrement.
     zoom_level = old_zoom_level + zoom;
   } else {
     // Either the user hit the zoom factor limit and thus the zoom level is now
     // not a whole number, or a plugin changed it to a custom value.  We want
     // to go to the next whole number so that the user can always get back to
     // 100% with the keyboard/menu.
     if ((old_zoom_level > 1 && zoom > 0) ||
         (old_zoom_level < 1 && zoom < 0)) {
       zoom_level = static_cast<int>(old_zoom_level + zoom);
     } else {
       // We're going towards 100%, so first go to the next whole number.
       zoom_level = static_cast<int>(old_zoom_level);
     }
   }
   webview()->setZoomLevel(false, zoom_level);
-#else
-  ZoomFactorHelper(zoom, 0, 0, kScalingIncrement);
-#endif
   zoomLevelChanged();
 }
 
 void RenderViewImpl::OnZoomFactor(content::PageZoom zoom,
                                   int zoom_center_x, int zoom_center_y) {
   ZoomFactorHelper(zoom, zoom_center_x, zoom_center_y,
                    kScalingIncrementForGesture);
 }
 
 void RenderViewImpl::ZoomFactorHelper(content::PageZoom zoom,
@@ skipping 929 matching lines @@
       WebView::zoomLevelToZoomFactor(minimum_level) * 100);
   int maximum_percent = static_cast<int>(
       WebView::zoomLevelToZoomFactor(maximum_level) * 100);
 
   Send(new ViewHostMsg_UpdateZoomLimits(
       routing_id_, minimum_percent, maximum_percent, remember));
 }
 
 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(
       routing_id_, zoom_level, remember,
       GURL(webview()->mainFrame()->document().url())));
 }
 
 void RenderViewImpl::registerProtocolHandler(const WebString& scheme,
                                              const WebString& base_url,
                                              const WebString& url,
@@ skipping 167 matching lines @@
   return !!RenderThreadImpl::current()->compositor_thread();
 }
 
 void RenderViewImpl::OnJavaBridgeInit(
     const IPC::ChannelHandle& channel_handle) {
   DCHECK(!java_bridge_dispatcher_.get());
 #if defined(ENABLE_JAVA_BRIDGE)
   java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this, channel_handle));
 #endif
 }