summaryrefslogtreecommitdiffstats
path: root/chrome/app
diff options
context:
space:
mode:
authorjamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-05 19:09:29 +0000
committerjamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-05 19:09:29 +0000
commitfdce35e5374b352f84c686c39e6214255f4d2d7a (patch)
tree1d86db45b85fab0ab47f37ece515593ad4f6e119 /chrome/app
parent054584c3921dc77f7a6fdcab2ebf2b0a4621cae8 (diff)
downloadchromium_src-fdce35e5374b352f84c686c39e6214255f4d2d7a.zip
chromium_src-fdce35e5374b352f84c686c39e6214255f4d2d7a.tar.gz
chromium_src-fdce35e5374b352f84c686c39e6214255f4d2d7a.tar.bz2
Revert 180720 - I missed a case where immersive mode could still be triggered
> ash: Turn immersive mode off by default for M26 > > * Add back the --ash-immersive-mode flag > * Change about:flags to just turn immersive mode on/off > * Convert --ash-immersive-hide-tab-indicators as a command-line only flag > > BUG=174060 > TEST=browser_tests BrowserNonClientFrameViewAsh unit_tests ImmersiveModeController > > Review URL: https://codereview.chromium.org/12194022 TBR=jamescook@chromium.org Review URL: https://codereview.chromium.org/12226016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180750 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r--chrome/app/generated_resources.grd7
1 files changed, 5 insertions, 2 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index dfc4aec..45fe36d 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -6775,10 +6775,13 @@ Keep your key file in a safe place. You will need it to create new versions of y
Enables workspace switching via 3 finger vertical scroll.
</message>
<message name="IDS_FLAGS_ASH_IMMERSIVE_MODE_NAME" desc="Title for the flag to set the immersive mode style.">
- Immersive mode
+ Immersive window style
</message>
<message name="IDS_FLAGS_ASH_IMMERSIVE_MODE_DESCRIPTION" desc="Description for the flag to enable immersive mode.">
- Adds an "immersive mode" for browser windows that gives more space to web content. Activate immersive mode by maximizing a window then clicking on the button in the top right corner.
+ Sets the style of an "immersive mode" for browser windows that gives more space to web content. Activate immersive mode by maximizing a window then clicking on the button in the top right corner.
+ </message>
+ <message name="IDS_FLAGS_ASH_IMMERSIVE_HIDE_TAB_INDICATORS" desc="Description a selection in the immersive mode popup menu.">
+ Hide tab indicators
</message>
<message name="IDS_FLAGS_ENABLE_MEMORY_MONITOR_NAME" desc="Title for the flag to enable advanced gestures.">
Enable memory monitor