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

Unified Diff: content/renderer/render_view_impl.cc

Issue 12722002: Enable pinch & scrollbars by default for CrOS. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased, set default flag value to 'disabled'. Created 7 years, 8 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 | « content/renderer/gpu/render_widget_compositor.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 d2e16cabd21b0229dad7f7e62fc8959ff837ccda..abbeae86d802eccb043d39ca5ac9e64779831a75 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -3341,11 +3341,9 @@ void RenderViewImpl::ProcessViewLayoutFlags(const CommandLine& command_line) {
webview()->setFixedLayoutSize(WebSize(width, height));
}
}
-
- if (command_line.HasSwitch(switches::kEnablePinch))
- webview()->setPageScaleFactorLimits(1, 4);
- else
- webview()->setPageScaleFactorLimits(1, 1);
+ float maxPageScaleFactor =
+ command_line.HasSwitch(switches::kEnablePinch) ? 4.f : 1.f ;
+ webview()->setPageScaleFactorLimits(1, maxPageScaleFactor);
}
void RenderViewImpl::didStartProvisionalLoad(WebFrame* frame) {
« no previous file with comments | « content/renderer/gpu/render_widget_compositor.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698