Index: content/renderer/render_view_impl.cc |
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc |
index 97c85fce06a9f976478cbac5d455758e14d16d2f..b0f800b93daedca94a9a8ad8d667767624a052d5 100644 |
--- a/content/renderer/render_view_impl.cc |
+++ b/content/renderer/render_view_impl.cc |
@@ -3396,11 +3396,17 @@ void RenderViewImpl::ProcessViewLayoutFlags(const CommandLine& command_line) { |
webview()->setFixedLayoutSize(WebSize(width, height)); |
} |
} |
- |
+#if defined(OS_CHROMEOS) |
+ if (command_line.HasSwitch(switches::kDisablePinch)) |
darin (slow to review)
2013/03/08 22:41:22
I think you should break this apart so you are not
wjmaclean
2013/03/11 13:09:10
Done.
|
+ webview()->setPageScaleFactorLimits(1, 1); |
+ else |
+ webview()->setPageScaleFactorLimits(1, 4); |
+#else |
if (command_line.HasSwitch(switches::kEnablePinch)) |
webview()->setPageScaleFactorLimits(1, 4); |
else |
webview()->setPageScaleFactorLimits(1, 1); |
+#endif |
} |
void RenderViewImpl::didStartProvisionalLoad(WebFrame* frame) { |