Starts splitting out shell window ids

ash/shell_window_ids.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef ASH_SHELL_WINDOW_IDS_H_
 #define ASH_SHELL_WINDOW_IDS_H_
 
+#include "ash/wm/common/wm_shell_window_ids.h"
+
 // Declarations of ids of special shell windows.
 
 namespace ash {
 
 // A higher-level container that holds all of the containers stacked below
 // kShellWindowId_LockScreenContainer.  Only used by PowerButtonController for
 // animating lower-level containers.
 const int kShellWindowId_NonLockScreenContainersContainer = 0;
 
 // A higher-level container that holds containers that hold lock-screen
@@ skipping 18 matching lines @@
 const int kShellWindowId_VirtualKeyboardContainer = 5;
 
 // TODO(sky): rename kShellWindowId_DefaultContainer.
 
 // The container for standard top-level windows.
 const int kShellWindowId_DefaultContainer = 6;
 
 // The container for top-level windows with the 'always-on-top' flag set.
 const int kShellWindowId_AlwaysOnTopContainer = 7;
 
-// The container for windows docked to either side of the desktop.
-const int kShellWindowId_DockedContainer = 8;
+// The container for windows docked to either side of the desktop. Shell id is
+// defined in wm_shell_window_ids.
+
+static_assert(kShellWindowId_AlwaysOnTopContainer + 1 ==
+                  kShellWindowId_DockedContainer,
+              "docked container must be immediately after always on top");
 
 // The container for the shelf.
 const int kShellWindowId_ShelfContainer = 9;
 
+static_assert(kShellWindowId_DockedContainer + 1 ==
+                  kShellWindowId_ShelfContainer,
+              "shelf container must be immediately after docked container");
+
 // The container for bubbles which float over the shelf.
 const int kShellWindowId_ShelfBubbleContainer = 10;
 
 // The container for panel windows.
 const int kShellWindowId_PanelContainer = 11;
 
 // The container for the app list.
 const int kShellWindowId_AppListContainer = 12;
 
 // The container for user-specific modal windows.
@@ skipping 36 matching lines @@
 // The container for mouse cursor.
 const int kShellWindowId_MouseCursorContainer = 24;
 
 // The topmost container, used for power off animation.
 const int kShellWindowId_PowerButtonAnimationContainer = 25;
 
 }  // namespace ash
 
 
 #endif  // ASH_SHELL_WINDOW_IDS_H_