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..9a27a2e38688fdf2ea479208503bffd7127a3fc4 100644
--- a/ash/shell_window_ids.h
+++ b/ash/shell_window_ids.h
@@ -37,16 +37,21 @@ 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. Defined in wm_shell_window_ids.
 
-// The container for standard top-level windows.
-const int kShellWindowId_DefaultContainer = 6;
+static_assert(kShellWindowId_VirtualKeyboardContainer + 1 ==

[James Cook, 2016/04/26 23:36:18]

nit: These lines might be slightly clearer as:

static_assert(kShellWindowId_DefaultContainer ==
    kShellWindowId_VirtualKeyboardContainer + 1,
    ....)

This would put the "DefaultContainer" part next to the comment above.

[sky, 2016/04/26 23:58:27]

I wasn't really happy with how this file was going. I added back the constants
(commented out) as I feel that makes it more readable. And I moved the asserts
to the end of the file as putting them inline hurts readability too. I also made
an assert covering both the previous and next container. Again, I think that
improves readability. Hopefully you agree.

As to the message, apparently it's not until c++17 that it becomes optional.
Yowza!

Lastly, I'm running git cl format, so it picks how this code looks.

+                  kShellWindowId_DefaultContainer,
+              "docked container must be immediately after always on top");

[James Cook, 2016/04/26 23:36:18]

nit: update error message, or just get rid of it

 
 // 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_DefaultContainer + 1 ==
+                  kShellWindowId_AlwaysOnTopContainer,
+              "docked container must be immediately after always on top");

[James Cook, 2016/04/26 23:36:18]

ditto

+
+// The container for windows docked to either side of the desktop. Defined in
+// wm_shell_window_ids.
 
 static_assert(kShellWindowId_AlwaysOnTopContainer + 1 ==
                   kShellWindowId_DockedContainer,
@@ -62,12 +67,18 @@ static_assert(kShellWindowId_DockedContainer + 1 ==
 // 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.
+static_assert(kShellWindowId_ShelfBubbleContainer + 1 ==
+                  kShellWindowId_PanelContainer,
+              "docked container must be immediately after always on top");

[James Cook, 2016/04/26 23:36:18]

ditto

 
 // The container for the app list.
 const int kShellWindowId_AppListContainer = 12;
 
+static_assert(kShellWindowId_PanelContainer + 1 ==
+                  kShellWindowId_AppListContainer,
+              "shelf container must be immediately after docked container");

[James Cook, 2016/04/26 23:36:18]

ditto

+
 // The container for user-specific modal windows.
 const int kShellWindowId_SystemModalContainer = 13;