summaryrefslogtreecommitdiffstats
path: root/ash/ash_switches.h
diff options
context:
space:
mode:
authoroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-17 23:34:50 +0000
committeroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-17 23:34:50 +0000
commit8039e06c060c94a67d8478bd81e2c0609c6b7b26 (patch)
treed0e7f7b04a9fa21bd026978388781f82ce120ca7 /ash/ash_switches.h
parent6cdd707b95c519e342df380b5ee9d177f7965dd2 (diff)
downloadchromium_src-8039e06c060c94a67d8478bd81e2c0609c6b7b26.zip
chromium_src-8039e06c060c94a67d8478bd81e2c0609c6b7b26.tar.gz
chromium_src-8039e06c060c94a67d8478bd81e2c0609c6b7b26.tar.bz2
Enable launcher on all displays by default
Updated tests to work on both environment. I did this so that we can just flip the flag when we need to turn this off. BUG=166119 TEST=some tests were updated to work under this environment. Review URL: https://chromiumcodereview.appspot.com/11975019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@177529 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/ash_switches.h')
-rw-r--r--ash/ash_switches.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/ash_switches.h b/ash/ash_switches.h
index aa3c37c..bc45e4a 100644
--- a/ash/ash_switches.h
+++ b/ash/ash_switches.h
@@ -28,6 +28,7 @@ ASH_EXPORT extern const char kAshDisableDisplayChangeLimiter[];
ASH_EXPORT extern const char kAshDisablePanelFitting[];
ASH_EXPORT extern const char kAshDisableBootAnimation2[];
ASH_EXPORT extern const char kAshDisableNewLockAnimations[];
+ASH_EXPORT extern const char kAshDisableLauncherPerDisplay[];
ASH_EXPORT extern const char kAshEnableAdvancedGestures[];
ASH_EXPORT extern const char kAshEnableBrightnessControl[];
#if defined(OS_LINUX)
@@ -38,7 +39,6 @@ ASH_EXPORT extern const char kAshEnableOak[];
ASH_EXPORT extern const char kAshEnableTrayDragging[];
ASH_EXPORT extern const char kAshEnableWorkspaceScrubbing[];
ASH_EXPORT extern const char kAshImmersiveHideTabIndicators[];
-ASH_EXPORT extern const char kAshLauncherPerDisplay[];
ASH_EXPORT extern const char kAshSecondaryDisplayLayout[];
ASH_EXPORT extern const char kAshTouchHud[];
ASH_EXPORT extern const char kAuraLegacyPowerButton[];