summaryrefslogtreecommitdiffstats
path: root/chrome/app
diff options
context:
space:
mode:
authorskuhne@google.com <skuhne@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-05 15:38:42 +0000
committerskuhne@google.com <skuhne@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-05 15:38:42 +0000
commite4b812270d6143e0aa8bafb7037b45f073287e34 (patch)
tree5a9dcd27d20000810681210a357dbb502128cc50 /chrome/app
parenta90a55510fa30e8093aae0c070af5e43e0a54fd3 (diff)
downloadchromium_src-e4b812270d6143e0aa8bafb7037b45f073287e34.zip
chromium_src-e4b812270d6143e0aa8bafb7037b45f073287e34.tar.gz
chromium_src-e4b812270d6143e0aa8bafb7037b45f073287e34.tar.bz2
Not great - but temporary of nature: Disabling the new launcher per default, but leaving the old flags for unit test reasons in.
BUG=174052 TEST=visual&unit test TBR=jamescook@chromiumorg.com Review URL: https://codereview.chromium.org/12183031 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180704 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r--chrome/app/generated_resources.grd12
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 1faf697..25ef7b6c4 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -6731,6 +6731,12 @@ Keep your key file in a safe place. You will need it to create new versions of y
<message name="IDS_FLAGS_ASH_AUTO_WINDOW_PLACEMENT_NAME" desc="Name for the option to enable/disable the auto window placement functionality.">
Automatic window placement.
</message>
+ <message name="IDS_FLAGS_ASH_ENABLE_PER_APP_LAUNCHER_NAME" desc="Name for the option to enable/disable the per application sorting launcher functionality.">
+ Per application sorting in the launcher.
+ </message>
+ <message name="IDS_FLAGS_ASH_ENABLE_PER_APP_LAUNCHER_DESCRIPTION" desc="Description for the option to enable/disable the per application sorting launcher functionality.">
+ Enable the per application sorting mode of the launcher.
+ </message>
<message name="IDS_FLAGS_ASH_AUTO_WINDOW_PLACEMENT_DESCRIPTION" desc="Description for the option to enable/disable the auto window placement functionality.">
Disable automatic window placement for one and two browser / app windows.
</message>
@@ -6740,12 +6746,6 @@ Keep your key file in a safe place. You will need it to create new versions of y
<message name="IDS_FLAGS_AURA_DISABLE_HOLD_MOUSE_MOVES_DESCRIPTION" desc="Description for the flag to disable throttling the rate of window resize.">
Disable throttling the rate of window resize. We throttle the resize for less perceived latency.
</message>
- <message name="IDS_FLAGS_ASH_DISABLE_PER_APP_LAUNCHER_NAME" desc="Name for the option to enable/disable the per application sorting launcher functionality.">
- Disable per application sorting in the launcher.
- </message>
- <message name="IDS_FLAGS_ASH_DISABLE_PER_APP_LAUNCHER_DESCRIPTION" desc="Description for the option to enable/disable the per application sorting launcher functionality.">
- Disable the per application sorting mode of the launcher.
- </message>
<message name="IDS_FLAGS_ENABLE_WEBAUDIO_INPUT_NAME" desc="Title for the flag to enable the webaudio input feature.">
Web Audio Input
</message>