Moves RootWindowControllerCommon and LayoutManager to common

ash/common/shell_window_ids.h

Index: ash/common/shell_window_ids.h
diff --git a/ash/shell_window_ids.h b/ash/common/shell_window_ids.h
similarity index 80%
rename from ash/shell_window_ids.h
rename to ash/common/shell_window_ids.h
index cb578cc1d52d96b2be455fe20afe29ca12719be5..8681e9c5d44b01e4c39077611d8583431bfc8dca 100644
--- a/ash/shell_window_ids.h
+++ b/ash/common/shell_window_ids.h
@@ -2,10 +2,8 @@
 // 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/common/wm/wm_shell_window_ids.h"
+#ifndef ASH_COMMON_SHELL_WINDOW_IDS_H_
+#define ASH_COMMON_SHELL_WINDOW_IDS_H_
 
 // Declarations of ids of special shell windows.
 
@@ -28,8 +26,8 @@ const int kShellWindowId_LockScreenContainersContainer = 1;
 const int kShellWindowId_LockScreenRelatedContainersContainer = 2;
 
 // A container used for windows of WINDOW_TYPE_CONTROL that have no parent.
-// This container is not visible. Defined in wm_shell_window_ids.
-// kShellWindowId_UnparentedControlContainer = 3;
+// This container is not visible.
+const int kShellWindowId_UnparentedControlContainer = 3;
 
 // The desktop background window.
 const int kShellWindowId_DesktopBackgroundContainer = 4;
@@ -37,41 +35,38 @@ const int kShellWindowId_DesktopBackgroundContainer = 4;
 // The virtual keyboard container.
 const int kShellWindowId_VirtualKeyboardContainer = 5;
 
-// The container for standard top-level windows. Defined in wm_shell_window_ids.
-// kShellWindowId_DefaultContainer = 6;
+// 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.
-// kShellWindowId_AlwaysOnTopContainer = 7;
+const int 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 windows docked to either side of the desktop.
+const int kShellWindowId_DockedContainer = 8;
 
-// The container for the shelf. Defined in wm_shell_window_ids.
-// kShellWindowId_ShelfContainer = 9;
+// The container for the shelf.
+const int 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 panel windows.
+const int kShellWindowId_PanelContainer = 11;
 
-// The container for the app list. Defined in wm_shell_window_ids.
-// kShellWindowId_AppListContainer = 12;
+// The container for the app list.
+const int kShellWindowId_AppListContainer = 12;
 
-// The container for user-specific modal windows. Defined in
-// wm_shell_window_ids
-// kShellWindowId_SystemModalContainer = 13;
+// The container for user-specific modal windows.
+const int kShellWindowId_SystemModalContainer = 13;
 
 // The container for the lock screen background.
 const int kShellWindowId_LockScreenBackgroundContainer = 14;
 
-// The container for the lock screen. Defined in wm_shell_window_ids.
-// kShellWindowId_LockScreenContainer = 15;
+// The container for the lock screen.
+const int kShellWindowId_LockScreenContainer = 15;
 
-// The container for the lock screen modal windows. Defined in
-// wm_shell_window_ids.
-// kShellWindowId_LockSystemModalContainer = 16;
+// The container for the lock screen modal windows.
+const int kShellWindowId_LockSystemModalContainer = 16;
 
 // The container for the status area.
 const int kShellWindowId_StatusContainer = 17;
@@ -81,24 +76,22 @@ const int kShellWindowId_StatusContainer = 17;
 // above most containers but below the mouse cursor and the power off animation.
 const int kShellWindowId_ImeWindowParentContainer = 18;
 
-// The container for menus. Defined in wm_shell_window_ids.
-// kShellWindowId_MenuContainer = 19;
+// The container for menus.
+const int kShellWindowId_MenuContainer = 19;
 
-// The container for drag/drop images and tooltips. Defined in
-// wm_shell_window_ids.
-// const int kShellWindowId_DragImageAndTooltipContainer = 20;
+// The container for drag/drop images and tooltips.
+const int kShellWindowId_DragImageAndTooltipContainer = 20;
 
 // 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. Defined in wm_shell_window_ids.
-// const int kShellWindowId_OverlayContainer = 22;
+// region selector for partial screenshots.
+const int kShellWindowId_OverlayContainer = 22;
 
 // ID of the window created by PhantomWindowController or DragWindowController.
-// Defined in wm_shell_window_ids.
-// kShellWindowId_PhantomWindow = 23;
+const int kShellWindowId_PhantomWindow = 23;
 
 // The container for mouse cursor.
 const int kShellWindowId_MouseCursorContainer = 24;
@@ -106,6 +99,9 @@ const int kShellWindowId_MouseCursorContainer = 24;
 // The topmost container, used for power off animation.
 const int kShellWindowId_PowerButtonAnimationContainer = 25;
 
+// TODO(sky): remove. Temporary for rietveld to pick up file move rather than

[sky, 2016/06/01 19:52:04]

I'll TBR a patch to remove the static_asserts after this lands.

[James Cook, 2016/06/01 20:58:32]

Acknowledged.

+// new file.
+
 static_assert((kShellWindowId_UnparentedControlContainer - 1 ==
                kShellWindowId_LockScreenRelatedContainersContainer) &&
                   (kShellWindowId_UnparentedControlContainer + 1 ==
@@ -194,4 +190,4 @@ static_assert((kShellWindowId_PhantomWindow - 1 ==
 
 }  // namespace ash
 
-#endif  // ASH_SHELL_WINDOW_IDS_H_
+#endif  // ASH_COMMON_SHELL_WINDOW_IDS_H_