summaryrefslogtreecommitdiffstats
path: root/chrome/app
diff options
context:
space:
mode:
authorwjmaclean@chromium.org <wjmaclean@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-27 18:16:43 +0000
committerwjmaclean@chromium.org <wjmaclean@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-27 18:16:43 +0000
commitde0aaedf4bbced8a935201e2b2e7f48d3a2bf502 (patch)
tree51f8a43ec845497299db4bc91455df7363f2774e /chrome/app
parent53286292d6369b4a7afac8f5b27be8b0029d048e (diff)
downloadchromium_src-de0aaedf4bbced8a935201e2b2e7f48d3a2bf502.zip
chromium_src-de0aaedf4bbced8a935201e2b2e7f48d3a2bf502.tar.gz
chromium_src-de0aaedf4bbced8a935201e2b2e7f48d3a2bf502.tar.bz2
Plumb pinch virtual viewport flag to CC.
This flag will protect the refactoring work for the pinch virtual viewport. TBR=cevans@chromium.org 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
Diffstat (limited to 'chrome/app')
-rw-r--r--chrome/app/generated_resources.grd6
1 files changed, 6 insertions, 0 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 226cea1..ba2f5e1 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -6966,6 +6966,12 @@ Keep your key file in a safe place. You will need it to create new versions of y
<message name="IDS_FLAGS_ENABLE_PINCH_SCALE_DESCRIPTION" desc="Description of the flag to turn on experiental pinch to scale.">
Enables experimental support for scale using pinch.
</message>
+ <message name="IDS_FLAGS_ENABLE_PINCH_VIRTUAL_VIEWPORT_NAME" desc="Name of the flag to turn on experimental pinch virtual viewport.">
+ Enable pinch virtual viewport.
+ </message>
+ <message name="IDS_FLAGS_ENABLE_PINCH_VIRTUAL_VIEWPORT_DESCRIPTION" desc="Description of the flag to turn on experimental pinch virtual viewport.">
+ When zoomed in, fixed-position elements and scaled scrollbars attach to this viewport.
+ </message>
<message name="IDS_FLAGS_NEW_DIALOG_STYLE_NAME" desc="Name of the flag to use the classic or new dialog style.">
New Dialog Style.
</message>