diff options
| author | bokan@chromium.org <bokan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-28 10:29:00 +0000 |
|---|---|---|
| committer | bokan@chromium.org <bokan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-28 10:29:00 +0000 |
| commit | fe89d82f7d90d1bc084bc4dd49269ce530c50cbf (patch) | |
| tree | 923030d92fc4f18ce04af5ccdd1b4de7cd4c0ae0 /content/browser/renderer_host/render_view_host_impl.cc | |
| parent | 6fa615b4eff8602ae539686e28fcbafd7deab1c6 (diff) | |
| download | chromium_src-fe89d82f7d90d1bc084bc4dd49269ce530c50cbf.zip chromium_src-fe89d82f7d90d1bc084bc4dd49269ce530c50cbf.tar.gz chromium_src-fe89d82f7d90d1bc084bc4dd49269ce530c50cbf.tar.bz2 | |
Fix for pinch virtual viewport flag wasn't fully enabled.
Missed a case when enabling the flag on CrOS in r266119.
BUG=367099
Review URL: https://codereview.chromium.org/257903002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266504 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/renderer_host/render_view_host_impl.cc')
| -rw-r--r-- | content/browser/renderer_host/render_view_host_impl.cc | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc index cfd1af1..fb77177 100644 --- a/content/browser/renderer_host/render_view_host_impl.cc +++ b/content/browser/renderer_host/render_view_host_impl.cc @@ -431,13 +431,7 @@ WebPreferences RenderViewHostImpl::GetWebkitPrefs(const GURL& url) { prefs.region_based_columns_enabled = command_line.HasSwitch(switches::kEnableRegionBasedColumns); -#if defined(OS_CHROMEOS) - bool enable_pinch_virtual_viewport = true; -#else - bool enable_pinch_virtual_viewport = - command_line.HasSwitch(cc::switches::kEnablePinchVirtualViewport); -#endif - if (enable_pinch_virtual_viewport) { + if (IsPinchVirtualViewportEnabled()) { prefs.pinch_virtual_viewport_enabled = true; prefs.pinch_overlay_scrollbar_thickness = 10; } |