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

Unified Diff: content/renderer/render_view.cc

Issue 7645012: Revert 96694 - Enabled scaling zoom for TOUCH_UI due to Linux Touch build breakage. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 4 months 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_view.cc
===================================================================
--- content/renderer/render_view.cc (revision 96694)
+++ content/renderer/render_view.cc (working copy)
@@ -263,8 +263,6 @@
static const char kBackForwardNavigationScheme[] = "history";
-static const float kScalingIncrement = 0.1f;
-
static void GetRedirectChain(WebDataSource* ds, std::vector<GURL>* result) {
WebVector<WebURL> urls;
ds->redirectChain(urls);
@@ -3379,7 +3377,7 @@
return;
webview()->hidePopups();
-#if !defined(TOUCH_UI)
+
double old_zoom_level = webview()->zoomLevel();
double zoom_level;
if (function == PageZoom::RESET) {
@@ -3400,18 +3398,8 @@
zoom_level = static_cast<int>(old_zoom_level);
}
}
+
webview()->setZoomLevel(false, zoom_level);
-#else
- double old_page_scale_factor = webview()->pageScaleFactor();
- double page_scale_factor;
- if (function == PageZoom::RESET) {
- page_scale_factor = 1.0;
- } else {
- page_scale_factor = old_page_scale_factor +
- (function > 0 ? kScalingIncrement : -kScalingIncrement);
- }
- webview()->scalePage(page_scale_factor, WebPoint(0, 0));
-#endif
zoomLevelChanged();
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698