summaryrefslogtreecommitdiffstats
path: root/cc/base
diff options
context:
space:
mode:
authorwjmaclean@chromium.org <wjmaclean@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-10 15:20:38 +0000
committerwjmaclean@chromium.org <wjmaclean@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-10 15:20:38 +0000
commite4cd82eb189ce76bb72726ac159242f9881f713e (patch)
treeabb40ecf52c64c7525ba252e504f8ed0820783aa /cc/base
parent6fcaf608a02de4bc6e91c3f07c7d72a408f6d1df (diff)
downloadchromium_src-e4cd82eb189ce76bb72726ac159242f9881f713e.zip
chromium_src-e4cd82eb189ce76bb72726ac159242f9881f713e.tar.gz
chromium_src-e4cd82eb189ce76bb72726ac159242f9881f713e.tar.bz2
Enable pinch & pinch-zoom scrollbars by default for CrOS.
BUG=none Review URL: https://chromiumcodereview.appspot.com/12722002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@193387 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/base')
-rw-r--r--cc/base/switches.cc4
-rw-r--r--cc/base/switches.h2
2 files changed, 6 insertions, 0 deletions
diff --git a/cc/base/switches.cc b/cc/base/switches.cc
index 36e20ab..5cedee9 100644
--- a/cc/base/switches.cc
+++ b/cc/base/switches.cc
@@ -80,6 +80,10 @@ const char kMaxTilesForInterestArea[] = "max-tiles-for-interest-area";
const char kMaxUnusedResourceMemoryUsagePercentage[] =
"max-unused-resource-memory-usage-percentage";
+// Causes overlay scrollbars to appear when zoomed in ChromeOS/Windows.
+const char kEnablePinchZoomScrollbars[] = "enable-pinch-zoom-scrollbars";
+const char kDisablePinchZoomScrollbars[] = "disable-pinch-zoom-scrollbars";
+
// Causes the compositor to render to textures which are then sent to the parent
// through the texture mailbox mechanism.
// Requires --enable-compositor-frame-message.
diff --git a/cc/base/switches.h b/cc/base/switches.h
index 2fd91ee..a1c9658 100644
--- a/cc/base/switches.h
+++ b/cc/base/switches.h
@@ -39,6 +39,8 @@ CC_EXPORT extern const char kCompositeToMailbox[];
CC_EXPORT extern const char kMaxPrepaintTileDistance[];
CC_EXPORT extern const char kMaxTilesForInterestArea[];
CC_EXPORT extern const char kMaxUnusedResourceMemoryUsagePercentage[];
+CC_EXPORT extern const char kEnablePinchZoomScrollbars[];
+CC_EXPORT extern const char kDisablePinchZoomScrollbars[];
// Switches for both the renderer and ui compositors.
CC_EXPORT extern const char kEnablePartialSwap[];