summaryrefslogtreecommitdiffstats
path: root/ash/ash_switches.cc
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 /ash/ash_switches.cc
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 'ash/ash_switches.cc')
-rw-r--r--ash/ash_switches.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/ash/ash_switches.cc b/ash/ash_switches.cc
index b50b7d4..1b9299e 100644
--- a/ash/ash_switches.cc
+++ b/ash/ash_switches.cc
@@ -70,6 +70,9 @@ const char kAshDisablePerAppLauncher[] = "ash-disable-per-app-launcher";
// Enables the Oak tree viewer.
const char kAshEnableOak[] = "ash-enable-oak";
+// Disable the new launcher version temporarily by default for the M25 release.
+const char kAshEnablePerAppLauncher[] = "ash-enable-per-app-launcher";
+
// Enables showing the tray bubble by dragging on the shelf.
const char kAshEnableTrayDragging[] = "ash-enable-tray-dragging";