Skip to content

Commit

Permalink
Removes static_assert from last patch
Browse files Browse the repository at this point in the history
It's no longer interesting in this file.

BUG=none
TEST=none
R=jamescook@chromium.org

Review-Url: https://codereview.chromium.org/2027383002
Cr-Commit-Position: refs/heads/master@{#397465}
  • Loading branch information
sky authored and Commit bot committed Jun 2, 2016
1 parent 14806cf commit 2ac80d2
Showing 1 changed file with 0 additions and 89 deletions.
89 changes: 0 additions & 89 deletions ash/common/shell_window_ids.h
Original file line number Diff line number Diff line change
Expand Up @@ -99,95 +99,6 @@ 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
// new file.

static_assert((kShellWindowId_UnparentedControlContainer - 1 ==
kShellWindowId_LockScreenRelatedContainersContainer) &&
(kShellWindowId_UnparentedControlContainer + 1 ==
kShellWindowId_DesktopBackgroundContainer),
"unparented-control between lock-screen-related and "
"desktop-background");

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_SystemModalContainer - 1 ==
kShellWindowId_AppListContainer) &&
(kShellWindowId_SystemModalContainer + 1 ==
kShellWindowId_LockScreenBackgroundContainer),
"system-modal between app-list and lock-screen-background");

static_assert((kShellWindowId_LockScreenContainer - 1 ==
kShellWindowId_LockScreenBackgroundContainer) &&
(kShellWindowId_LockScreenContainer + 1 ==
kShellWindowId_LockSystemModalContainer),
"lock-screen between lock-screen-background and "
"lock-screen-system-modal");

static_assert((kShellWindowId_LockSystemModalContainer - 1 ==
kShellWindowId_LockScreenContainer) &&
(kShellWindowId_LockSystemModalContainer + 1 ==
kShellWindowId_StatusContainer),
"lock-screen-system-modal between lock-screen and status");

static_assert((kShellWindowId_MenuContainer - 1 ==
kShellWindowId_ImeWindowParentContainer) &&
(kShellWindowId_MenuContainer + 1 ==
kShellWindowId_DragImageAndTooltipContainer),
"app-list between panel and system-modal");

static_assert((kShellWindowId_DragImageAndTooltipContainer - 1 ==
kShellWindowId_MenuContainer) &&
(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),
"phantom between overlay and mouse-cursor");

} // namespace ash

#endif // ASH_COMMON_SHELL_WINDOW_IDS_H_

0 comments on commit 2ac80d2

Please sign in to comment.