Retires WorkspaceContainer.

Now DefaultContainer holds the normal windows.

BUG=264396
R=sky@chromium.org
TEST=ash_unittests still passes

Review URL: https://chromiumcodereview.appspot.com/21806009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@215664 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 17 insertions, 23 deletions

diff --git a/ash/shell_window_ids.h b/ash/shell_window_ids.h
index 046f43a..406f417 100644
--- a/ash/shell_window_ids.h
+++ b/ash/shell_window_ids.h
@@ -39,68 +39,62 @@ const int kShellWindowId_DesktopBackgroundContainer = 4;
 // TODO(sky): rename kShellWindowId_DefaultContainer.
 
 // The container for standard top-level windows.
-// WARNING: 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 = 7;
+const int kShellWindowId_AlwaysOnTopContainer = 6;
 
 // The container for windows docked to either side of the desktop.
-const int kShellWindowId_DockedContainer = 8;
+const int kShellWindowId_DockedContainer = 7;
 
 // The container for panel windows.
-const int kShellWindowId_PanelContainer = 9;
+const int kShellWindowId_PanelContainer = 8;
 
 // The container for the shelf.
-const int kShellWindowId_ShelfContainer = 10;
+const int kShellWindowId_ShelfContainer = 9;
 
 // The container for the app list.
-const int kShellWindowId_AppListContainer = 11;
+const int kShellWindowId_AppListContainer = 10;
 
 // The container for user-specific modal windows.
-const int kShellWindowId_SystemModalContainer = 12;
+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 = 13;
+const int kShellWindowId_InputMethodContainer = 12;
 
 // The container for the lock screen background.
-const int kShellWindowId_LockScreenBackgroundContainer = 14;
+const int kShellWindowId_LockScreenBackgroundContainer = 13;
 
 // The container for the lock screen.
-const int kShellWindowId_LockScreenContainer = 15;
+const int kShellWindowId_LockScreenContainer = 14;
 
 // The container for the lock screen modal windows.
-const int kShellWindowId_LockSystemModalContainer = 16;
+const int kShellWindowId_LockSystemModalContainer = 15;
 
 // The container for the status area.
-const int kShellWindowId_StatusContainer = 17;
+const int kShellWindowId_StatusContainer = 16;
 
 // The container for menus.
-const int kShellWindowId_MenuContainer = 18;
+const int kShellWindowId_MenuContainer = 17;
 
 // The container for drag/drop images and tooltips.
-const int kShellWindowId_DragImageAndTooltipContainer = 19;
+const int kShellWindowId_DragImageAndTooltipContainer = 18;
 
 // The container for bubbles briefly overlaid onscreen to show settings changes
 // (volume, brightness, etc.).
-const int kShellWindowId_SettingBubbleContainer = 20;
+const int kShellWindowId_SettingBubbleContainer = 19;
 
 // The container for special components overlaid onscreen, such as the
 // region selector for partial screenshots.
-const int kShellWindowId_OverlayContainer = 21;
+const int kShellWindowId_OverlayContainer = 20;
 
 // ID of the window created by PhantomWindowController or DragWindowController.
-const int kShellWindowId_PhantomWindow = 22;
+const int kShellWindowId_PhantomWindow = 21;
 
 // The topmost container, used for power off animation.
-const int kShellWindowId_PowerButtonAnimationContainer = 23;
+const int kShellWindowId_PowerButtonAnimationContainer = 22;
 
 }  // namespace internal