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

Unified Diff: ash/shell_window_ids.h

Issue 2012343002: Converts overview to use common ash types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: feedback Created 4 years, 7 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
« no previous file with comments | « ash/shell.cc ('k') | ash/wm/aura/wm_globals_aura.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell_window_ids.h
diff --git a/ash/shell_window_ids.h b/ash/shell_window_ids.h
index 88636671a2a263ac4741564b57b1181d85baf21a..799bc056f9d40f1f2fe72dd982fc2314ce2d313d 100644
--- a/ash/shell_window_ids.h
+++ b/ash/shell_window_ids.h
@@ -93,8 +93,8 @@ const int kShellWindowId_ImeWindowParentContainer = 18;
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;
+// region selector for partial screenshots. Defined in wm_shell_window_ids.
+// const int kShellWindowId_OverlayContainer = 22;
// ID of the window created by PhantomWindowController or DragWindowController.
// Defined in wm_shell_window_ids.
@@ -180,11 +180,17 @@ static_assert((kShellWindowId_DragImageAndTooltipContainer - 1 ==
kShellWindowId_SettingBubbleContainer),
"drag-image-and-tooltip between menu and settings-bubble");
+static_assert((kShellWindowId_OverlayContainer - 1 ==
+ kShellWindowId_SettingBubbleContainer) &&
+ (kShellWindowId_OverlayContainer + 1 ==
+ kShellWindowId_PhantomWindow),
+ "overlay between settings-bubble and phantom");
+
static_assert((kShellWindowId_PhantomWindow - 1 ==
kShellWindowId_OverlayContainer) &&
(kShellWindowId_PhantomWindow + 1 ==
kShellWindowId_MouseCursorContainer),
- "phanton between overlay and mouse-cursor");
+ "phantom between overlay and mouse-cursor");
} // namespace ash
« no previous file with comments | « ash/shell.cc ('k') | ash/wm/aura/wm_globals_aura.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698