Refactors WindowResizers to use ash/wm/common

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.
@@ skipping 29 matching lines @@
 // The container for standard top-level windows. Defined in wm_shell_window_ids.
 // kShellWindowId_DefaultContainer = 6;
 
 // The container for top-level windows with the 'always-on-top' flag set.
 // kShellWindowId_AlwaysOnTopContainer = 7;
 
 // 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;
+// The container for the shelf. Defined in wm_shell_window_ids.
+// kShellWindowId_ShelfContainer = 9;
 
 // The container for bubbles which float over the shelf.
 const int kShellWindowId_ShelfBubbleContainer = 10;
 
 // The container for panel windows. Defined in wm_shell_window_ids.
 // kShellWindowId_PanelContainer = 11;
 
 // The container for the app list. Defined in wm_shell_window_ids.
 // kShellWindowId_AppListContainer = 12;
 
@@ skipping 25 matching lines @@
 
 // The container for bubbles briefly overlaid onscreen to show settings changes
 // (volume, brightness, input method bubbles, etc.).
 const int kShellWindowId_SettingBubbleContainer = 21;
 
 // The container for special components overlaid onscreen, such as the
 // region selector for partial screenshots.
 const int kShellWindowId_OverlayContainer = 22;
 
 // ID of the window created by PhantomWindowController or DragWindowController.
-const int kShellWindowId_PhantomWindow = 23;
+// Defined in wm_shell_window_ids.
+// kShellWindowId_PhantomWindow = 23;
 
 // The container for mouse cursor.
 const int kShellWindowId_MouseCursorContainer = 24;
 
 // The topmost container, used for power off animation.
 const int kShellWindowId_PowerButtonAnimationContainer = 25;
 
 static_assert((kShellWindowId_DefaultContainer - 1 ==
                kShellWindowId_VirtualKeyboardContainer) &&
                   (kShellWindowId_DefaultContainer + 1 ==
                    kShellWindowId_AlwaysOnTopContainer),
               "default between keyboard and always-on-top");
 
 static_assert((kShellWindowId_AlwaysOnTopContainer - 1 ==
                kShellWindowId_DefaultContainer) &&
                   (kShellWindowId_AlwaysOnTopContainer + 1 ==
                    kShellWindowId_DockedContainer),
               "always-on-top between default and docked");
 
 static_assert((kShellWindowId_DockedContainer - 1 ==
                kShellWindowId_AlwaysOnTopContainer) &&
                   (kShellWindowId_DockedContainer + 1 ==
                    kShellWindowId_ShelfContainer),
               "docked between always-on-top and shelf");
 
+static_assert((kShellWindowId_ShelfContainer - 1 ==
+               kShellWindowId_DockedContainer) &&
+                  (kShellWindowId_ShelfContainer + 1 ==
+                   kShellWindowId_ShelfBubbleContainer),
+              "shelf between docked and shelf-bubble");
+
 static_assert((kShellWindowId_PanelContainer - 1 ==
                kShellWindowId_ShelfBubbleContainer) &&
                   (kShellWindowId_PanelContainer + 1 ==
                    kShellWindowId_AppListContainer),
               "panel between shelf-bubble and app-list");
 
 static_assert((kShellWindowId_AppListContainer - 1 ==
                kShellWindowId_PanelContainer) &&
                   (kShellWindowId_AppListContainer + 1 ==
                    kShellWindowId_SystemModalContainer),
               "app-list between panel and system-modal");
 
+static_assert((kShellWindowId_PhantomWindow - 1 ==
+               kShellWindowId_OverlayContainer) &&
+                  (kShellWindowId_PhantomWindow + 1 ==
+                   kShellWindowId_MouseCursorContainer),
+              "phanton between overlay and mouse-cursor");
+
 }  // namespace ash
 
 #endif  // ASH_SHELL_WINDOW_IDS_H_