summaryrefslogtreecommitdiffstats
path: root/ash/ash_switches.h
diff options
context:
space:
mode:
authorjamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-01 05:10:36 +0000
committerjamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-01 05:10:36 +0000
commitd2840ef6903b4b7faab74e90de656d3381eab588 (patch)
treedaa1a126eb81e6afcbe8a7ae105fce082ac016ba /ash/ash_switches.h
parent598e6c2106e54970b8891e26e086af23a7e85f4b (diff)
downloadchromium_src-d2840ef6903b4b7faab74e90de656d3381eab588.zip
chromium_src-d2840ef6903b4b7faab74e90de656d3381eab588.tar.gz
chromium_src-d2840ef6903b4b7faab74e90de656d3381eab588.tar.bz2
Aura: Rework window mode flags to compact/overlapping/managed
* Rename "normal" to "overlapping", since there was some confusion about whether or not compact mode is "normal" * Remove "--aura-workspace-manager" flag in favor of "--aura-window-mode=managed", as this feature is not compatible with compact mode. * Change about:flags Window mode to a three-way choice between modes BUG=112139 TEST=aura_shell_unittests ShellTest, manual check of about:flags Review URL: http://codereview.chromium.org/9316005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120035 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/ash_switches.h')
-rw-r--r--ash/ash_switches.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/ash/ash_switches.h b/ash/ash_switches.h
index f086173..2fa7780 100644
--- a/ash/ash_switches.h
+++ b/ash/ash_switches.h
@@ -19,8 +19,8 @@ ASH_EXPORT extern const char kAuraNoShadows[];
ASH_EXPORT extern const char kAuraTranslucentFrames[];
ASH_EXPORT extern const char kAuraWindowMode[];
ASH_EXPORT extern const char kAuraWindowModeCompact[];
-ASH_EXPORT extern const char kAuraWindowModeNormal[];
-ASH_EXPORT extern const char kAuraWorkspaceManager[];
+ASH_EXPORT extern const char kAuraWindowModeManaged[];
+ASH_EXPORT extern const char kAuraWindowModeOverlapping[];
} // namespace switches
} // namespace ash