Plumb pinch virtual viewport flag to CC.
This flag will protect the refactoring work for the pinch virtual viewport.
[email protected]
BUG=none
NOTRY=true
Review URL: https://chromiumcodereview.appspot.com/15567005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202453 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 70b3a5d..fbb1e8d 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -1016,6 +1016,13 @@
ENABLE_DISABLE_VALUE_TYPE(switches::kEnablePinch, switches::kDisablePinch),
},
{
+ "enable-pinch-virtual-viewport",
+ IDS_FLAGS_ENABLE_PINCH_VIRTUAL_VIEWPORT_NAME,
+ IDS_FLAGS_ENABLE_PINCH_VIRTUAL_VIEWPORT_DESCRIPTION,
+ kOsLinux | kOsWin | kOsCrOS,
+ SINGLE_VALUE_TYPE(cc::switches::kEnablePinchVirtualViewport),
+ },
+ {
"forced-maximize-mode",
IDS_FLAGS_FORCE_MAXIMIZE_MODE_NAME,
IDS_FLAGS_FORCE_MAXIMIZE_MODE_DESCRIPTION,
diff --git a/chrome/browser/chromeos/login/chrome_restart_request.cc b/chrome/browser/chromeos/login/chrome_restart_request.cc
index ba3f98b..d2683c4 100644
--- a/chrome/browser/chromeos/login/chrome_restart_request.cc
+++ b/chrome/browser/chromeos/login/chrome_restart_request.cc
@@ -140,6 +140,7 @@
cc::switches::kEnableImplSidePainting,
cc::switches::kEnablePartialSwap,
cc::switches::kEnablePerTilePainting,
+ cc::switches::kEnablePinchVirtualViewport,
cc::switches::kEnableRightAlignedScheduling,
cc::switches::kEnableTopControlsPositionCalculation,
cc::switches::kForceDirectLayerDrawing,
