Moves DefaultContainer and PanelContainer to wm_shell_window_ids

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 d1d98684f231d3256de4e8629dabd89a35444f43..9ec95993f783faa1e1dd20c4fa1bbaab3901fc8e 100644
--- a/ash/shell_window_ids.h
+++ b/ash/shell_window_ids.h
@@ -37,33 +37,24 @@ const int kShellWindowId_DesktopBackgroundContainer = 4;
 // The virtual keyboard container.
 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 standard top-level windows. Defined in wm_shell_window_ids.
+// kShellWindowId_DefaultContainer = 6;

[James Cook, 2016/04/27 00:53:30]

Yeah, this is much easier for me to read.

 
 // 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. 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 windows docked to either side of the desktop. Defined in
+// wm_shell_window_ids.
+// kShellWindowId_DockedContainer = 8;
 
 // 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 panel windows. Defined in wm_shell_window_ids.
+// kShellWindowId_PanelContainer = 11;
 
 // The container for the app list.
 const int kShellWindowId_AppListContainer = 12;
@@ -111,7 +102,24 @@ const int kShellWindowId_MouseCursorContainer = 24;
 // The topmost container, used for power off animation.
 const int kShellWindowId_PowerButtonAnimationContainer = 25;
 
-}  // namespace ash
+static_assert((kShellWindowId_DefaultContainer - 1 ==
+               kShellWindowId_VirtualKeyboardContainer) &&
+                  (kShellWindowId_DefaultContainer + 1 ==
+                   kShellWindowId_AlwaysOnTopContainer),
+              "default between keyboard and always-on-top");

[James Cook, 2016/04/27 00:53:30]

optional: Maybe stick the container that is in the middle of the list in the
middle of the statement?

static_assert((kShellWindowId_VirtualKeyboardContainer ==
               kShellWindowId_DefaultContainer - 1) &&
                  (kShellWindowId_DefaultContainer + 1 ==
                   kShellWindowId_AlwaysOnTopContainer),
              "default between keyboard and always-on-top");

or

static_assert((kShellWindowId_VirtualKeyboardContainer + 1 ==
               kShellWindowId_DefaultContainer) &&
                  (kShellWindowId_DefaultContainer ==
                   kShellWindowId_AlwaysOnTopContainer - 1),
              "default between keyboard and always-on-top");

?

 
+static_assert((kShellWindowId_DockedContainer - 1 ==
+               kShellWindowId_AlwaysOnTopContainer) &&
+                  (kShellWindowId_DockedContainer + 1 ==
+                   kShellWindowId_ShelfContainer),
+              "docked between always-on-top and shelf");
+
+static_assert((kShellWindowId_PanelContainer - 1 ==
+               kShellWindowId_ShelfBubbleContainer) &&
+                  (kShellWindowId_PanelContainer + 1 ==
+                   kShellWindowId_AppListContainer),
+              "panel between shelf-bubble and app-list");
+
+}  // namespace ash
 
 #endif  // ASH_SHELL_WINDOW_IDS_H_