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
diff --git a/ash/shell.h b/ash/shell.h
index ab4da7b..16add64a 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -65,11 +65,12 @@
class ASH_EXPORT Shell {
public:
// In compact window mode we fill the screen with a single maximized window,
- // similar to ChromeOS R17 and earlier. In normal mode we have draggable
- // windows.
+ // similar to ChromeOS R17 and earlier. In overlapping mode we have draggable
+ // windows. In managed mode the workspace arranges windows for the user.
enum WindowMode {
- NORMAL_MODE,
- COMPACT_MODE
+ MODE_COMPACT,
+ MODE_MANAGED,
+ MODE_OVERLAPPING,
};
// A shell must be explicitly created so that it can call |Init()| with the
@@ -107,7 +108,7 @@
bool IsModalWindowOpen() const;
// See enum WindowMode for details.
- bool IsWindowModeCompact() const { return window_mode_ == COMPACT_MODE; }
+ bool IsWindowModeCompact() const { return window_mode_ == MODE_COMPACT; }
// Creates a default views::NonClientFrameView for use by windows in the
// Ash environment.
@@ -158,7 +159,7 @@
// Initializes or re-initializes the layout managers and event filters needed
// to support a given window mode and cleans up the unneeded ones.
void SetupCompactWindowMode();
- void SetupNormalWindowMode();
+ void SetupNonCompactWindowMode();
// Sets the LayoutManager of the container with the specified id to NULL. This
// has the effect of deleting the current LayoutManager.
