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

Unified Diff: content/renderer/render_view_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 | « content/renderer/render_thread_impl.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 244bf8be6b201de4de772bee5dc76dd955555ba1..502bb67479243ba36ee31077b9e867be424f6bb6 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(
« no previous file with comments | « content/renderer/render_thread_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698