Initial crack at new workspace behavior. Each workspace now has its

ash/shell_window_ids.h

Index: ash/shell_window_ids.h
diff --git a/ash/shell_window_ids.h b/ash/shell_window_ids.h
index 8ac0f188cf026325ce973a03782985465b3225db..d837725da5438d19bfe53bd1f61055b2b1492b86 100644
--- a/ash/shell_window_ids.h
+++ b/ash/shell_window_ids.h
@@ -34,54 +34,63 @@ const int kShellWindowId_UnparentedControlContainer = 3;
 // The desktop background window.
 const int kShellWindowId_DesktopBackgroundContainer = 4;
 
+// TODO(sky): rename kShellWindowId_DefaultContainer when Workspace2 is the
+// default.
+
 // The container for standard top-level windows.
+// WARNING: when Workspace2 is enabled the only children of
+// kShellWindowId_DefaultContainer are kShellWindowId_WorkspaceContainer.
 const int kShellWindowId_DefaultContainer = 5;
 
+// Used by Worskpace2 for each workspace. Contains standard top-level windows.
+// WARNING: there may be more than one container with this id.
+const int kShellWindowId_WorkspaceContainer = 6;
+
 // The container for top-level windows with the 'always-on-top' flag set.
-const int kShellWindowId_AlwaysOnTopContainer = 6;
+const int kShellWindowId_AlwaysOnTopContainer = 7;
 
 // The container for panel windows.
-const int kShellWindowId_PanelContainer = 7;
+const int kShellWindowId_PanelContainer = 8;
 
 // The container for the launcher.
-const int kShellWindowId_LauncherContainer = 8;
+const int kShellWindowId_LauncherContainer = 9;
 
 // The container for the app list.
-const int kShellWindowId_AppListContainer = 9;
+const int kShellWindowId_AppListContainer = 10;
 
 // The container for user-specific modal windows.
-const int kShellWindowId_SystemModalContainer = 10;
+const int kShellWindowId_SystemModalContainer = 11;
 
 // The container for input method components such like candidate windows.  They
 // are almost panels but have no activations/focus, and they should appear over
 // the AppList and SystemModal dialogs.
-const int kShellWindowId_InputMethodContainer = 11;
+const int kShellWindowId_InputMethodContainer = 12;
 
 // The container for the lock screen background.
-const int kShellWindowId_LockScreenBackgroundContainer = 12;
+const int kShellWindowId_LockScreenBackgroundContainer = 13;
 
 // The container for the lock screen.
-const int kShellWindowId_LockScreenContainer = 13;
+const int kShellWindowId_LockScreenContainer = 14;
 
 // The container for the lock screen modal windows.
-const int kShellWindowId_LockSystemModalContainer = 14;
+const int kShellWindowId_LockSystemModalContainer = 15;
 
 // The container for the status area.
-const int kShellWindowId_StatusContainer = 15;
+const int kShellWindowId_StatusContainer = 16;
 
 // The container for menus.
-const int kShellWindowId_MenuContainer = 16;
+const int kShellWindowId_MenuContainer = 17;
 
 // The container for drag/drop images and tooltips.
-const int kShellWindowId_DragImageAndTooltipContainer = 17;
+const int kShellWindowId_DragImageAndTooltipContainer = 18;
 
 // The container for bubbles briefly overlaid onscreen to show settings changes
 // (volume, brightness, etc.).
-const int kShellWindowId_SettingBubbleContainer = 18;
+const int kShellWindowId_SettingBubbleContainer = 19;
 
 // The container for special components overlaid onscreen, such as the
 // region selector for partial screenshots.
-const int kShellWindowId_OverlayContainer = 19;
+const int kShellWindowId_OverlayContainer = 20;
 
 }  // namespace internal