Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2044)

Unified Diff: ash/shell_window_ids.h

Issue 1929023002: Refactors WindowResizers to use ash/wm/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ash/shell_window_ids.h
diff --git a/ash/shell_window_ids.h b/ash/shell_window_ids.h
index 5b011f95b4b75259cc134ded03367e340d43028f..a94c681a933397bebca924c00f00d26632e4fb54 100644
--- a/ash/shell_window_ids.h
+++ b/ash/shell_window_ids.h
@@ -47,8 +47,8 @@ const int kShellWindowId_VirtualKeyboardContainer = 5;
// 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;
@@ -94,7 +94,8 @@ const int kShellWindowId_SettingBubbleContainer = 21;
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;
@@ -120,6 +121,12 @@ static_assert((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 ==
@@ -132,6 +139,12 @@ static_assert((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_

Powered by Google App Engine
This is Rietveld 408576698