Aura: Rework window mode flags to compact/overlapping/managed

ash/ash_switches.cc

Index: ash/ash_switches.cc
diff --git a/ash/ash_switches.cc b/ash/ash_switches.cc
index f7ef7d1b1350d0db80e4ac0692897877737589d0..068e1738ae462b2e68ad8b4335d97a82b224469a 100644
--- a/ash/ash_switches.cc
+++ b/ash/ash_switches.cc
@@ -32,18 +32,19 @@ const char kAuraNoShadows[] = "aura-no-shadows";
 const char kAuraTranslucentFrames[] = "aura-translucent-frames";
 
 // Use a custom window style, e.g. --aura-window-mode=compact.
-// When this flag is not passed we default to "normal" mode.
+// When this flag is not passed we default to "overlapping" mode.
 const char kAuraWindowMode[] = "aura-window-mode";
 
 // Show only a single maximized window, like traditional non-Aura builds.
 // Useful for low-resolution screens, such as on laptops.
 const char kAuraWindowModeCompact[] = "compact";
 
-// Default window management with multiple draggable windows.
-const char kAuraWindowModeNormal[] = "normal";
+// Smart window management with workspace manager that automatically lays out
+// windows.
+const char kAuraWindowModeManaged[] = "managed";
 
-// Use Aura-style workspace window dragging and sizing.
-const char kAuraWorkspaceManager[] = "aura-workspace-manager";
+// Traditional window management with multiple draggable windows.
+const char kAuraWindowModeOverlapping[] = "overlapping";
 
 }  // namespace switches
 }  // namespace ash