| Index: ash/public/cpp/shell_window_ids.h
|
| diff --git a/ash/public/cpp/shell_window_ids.h b/ash/public/cpp/shell_window_ids.h
|
| index f5f1fc233e92a0b54e0131f505755786801fe6df..38f27716fd75fcdcdcc68ff8e936d15febd95b78 100644
|
| --- a/ash/public/cpp/shell_window_ids.h
|
| +++ b/ash/public/cpp/shell_window_ids.h
|
| @@ -17,93 +17,97 @@ namespace ash {
|
| // Used to indicate no shell window id.
|
| const int32_t kShellWindowId_Invalid = -1;
|
|
|
| +// The screen rotation container in between root window and its children, used
|
| +// for screen rotation animation.
|
| +const int32_t kShellWindowId_ScreenRotationContainer = 0;
|
| +
|
| // A higher-level container that holds all of the containers stacked below
|
| // kShellWindowId_LockScreenContainer. Only used by PowerButtonController for
|
| // animating lower-level containers.
|
| -const int32_t kShellWindowId_NonLockScreenContainersContainer = 0;
|
| +const int32_t kShellWindowId_NonLockScreenContainersContainer = 1;
|
|
|
| // A higher-level container that holds containers that hold lock-screen
|
| // windows. Only used by PowerButtonController for animating lower-level
|
| // containers.
|
| -const int32_t kShellWindowId_LockScreenContainersContainer = 1;
|
| +const int32_t kShellWindowId_LockScreenContainersContainer = 2;
|
|
|
| // A higher-level container that holds containers that hold lock-screen-related
|
| // windows (which we want to display while the screen is locked; effectively
|
| // containers stacked above kShellWindowId_LockSystemModalContainer). Only used
|
| // by PowerButtonController for animating lower-level containers.
|
| -const int32_t kShellWindowId_LockScreenRelatedContainersContainer = 2;
|
| +const int32_t kShellWindowId_LockScreenRelatedContainersContainer = 3;
|
|
|
| // A container used for windows of WINDOW_TYPE_CONTROL that have no parent.
|
| // This container is not visible.
|
| -const int32_t kShellWindowId_UnparentedControlContainer = 3;
|
| +const int32_t kShellWindowId_UnparentedControlContainer = 4;
|
|
|
| // The wallpaper (desktop background) window.
|
| -const int32_t kShellWindowId_WallpaperContainer = 4;
|
| +const int32_t kShellWindowId_WallpaperContainer = 5;
|
|
|
| // The virtual keyboard container.
|
| // NOTE: this is lazily created.
|
| -const int32_t kShellWindowId_VirtualKeyboardContainer = 5;
|
| +const int32_t kShellWindowId_VirtualKeyboardContainer = 6;
|
|
|
| // The container for standard top-level windows.
|
| -const int32_t kShellWindowId_DefaultContainer = 6;
|
| +const int32_t kShellWindowId_DefaultContainer = 7;
|
|
|
| // The container for top-level windows with the 'always-on-top' flag set.
|
| -const int32_t kShellWindowId_AlwaysOnTopContainer = 7;
|
| +const int32_t kShellWindowId_AlwaysOnTopContainer = 8;
|
|
|
| // The container for the shelf.
|
| -const int32_t kShellWindowId_ShelfContainer = 8;
|
| +const int32_t kShellWindowId_ShelfContainer = 9;
|
|
|
| // The container for bubbles which float over the shelf.
|
| -const int32_t kShellWindowId_ShelfBubbleContainer = 9;
|
| +const int32_t kShellWindowId_ShelfBubbleContainer = 10;
|
|
|
| // The container for panel windows.
|
| -const int32_t kShellWindowId_PanelContainer = 10;
|
| +const int32_t kShellWindowId_PanelContainer = 11;
|
|
|
| // The container for the app list.
|
| -const int32_t kShellWindowId_AppListContainer = 11;
|
| +const int32_t kShellWindowId_AppListContainer = 12;
|
|
|
| // The container for user-specific modal windows.
|
| -const int32_t kShellWindowId_SystemModalContainer = 12;
|
| +const int32_t kShellWindowId_SystemModalContainer = 13;
|
|
|
| // The container for the lock screen wallpaper (lock screen background).
|
| -const int32_t kShellWindowId_LockScreenWallpaperContainer = 13;
|
| +const int32_t kShellWindowId_LockScreenWallpaperContainer = 14;
|
|
|
| // The container for the lock screen.
|
| -const int32_t kShellWindowId_LockScreenContainer = 14;
|
| +const int32_t kShellWindowId_LockScreenContainer = 15;
|
|
|
| // The container for the lock screen modal windows.
|
| -const int32_t kShellWindowId_LockSystemModalContainer = 15;
|
| +const int32_t kShellWindowId_LockSystemModalContainer = 16;
|
|
|
| // The container for the status area.
|
| -const int32_t kShellWindowId_StatusContainer = 16;
|
| +const int32_t kShellWindowId_StatusContainer = 17;
|
|
|
| // A parent container that holds the virtual keyboard container and ime windows
|
| // if any. This is to ensure that the virtual keyboard or ime window is stacked
|
| // above most containers but below the mouse cursor and the power off animation.
|
| -const int32_t kShellWindowId_ImeWindowParentContainer = 17;
|
| +const int32_t kShellWindowId_ImeWindowParentContainer = 18;
|
|
|
| // The container for menus.
|
| -const int32_t kShellWindowId_MenuContainer = 18;
|
| +const int32_t kShellWindowId_MenuContainer = 19;
|
|
|
| // The container for drag/drop images and tooltips.
|
| -const int32_t kShellWindowId_DragImageAndTooltipContainer = 19;
|
| +const int32_t kShellWindowId_DragImageAndTooltipContainer = 20;
|
|
|
| // The container for bubbles briefly overlaid onscreen to show settings changes
|
| // (volume, brightness, input method bubbles, etc.).
|
| -const int32_t kShellWindowId_SettingBubbleContainer = 20;
|
| +const int32_t kShellWindowId_SettingBubbleContainer = 21;
|
|
|
| // The container for special components overlaid onscreen, such as the
|
| // region selector for partial screenshots.
|
| -const int32_t kShellWindowId_OverlayContainer = 21;
|
| +const int32_t kShellWindowId_OverlayContainer = 22;
|
|
|
| // ID of the window created by PhantomWindowController or DragWindowController.
|
| -const int32_t kShellWindowId_PhantomWindow = 22;
|
| +const int32_t kShellWindowId_PhantomWindow = 23;
|
|
|
| // The container for mouse cursor.
|
| -const int32_t kShellWindowId_MouseCursorContainer = 23;
|
| +const int32_t kShellWindowId_MouseCursorContainer = 24;
|
|
|
| // The topmost container, used for power off animation.
|
| -const int32_t kShellWindowId_PowerButtonAnimationContainer = 24;
|
| +const int32_t kShellWindowId_PowerButtonAnimationContainer = 25;
|
|
|
| const int32_t kShellWindowId_Min = 0;
|
| const int32_t kShellWindowId_Max = kShellWindowId_PowerButtonAnimationContainer;
|
| @@ -111,31 +115,32 @@ const int32_t kShellWindowId_Max = kShellWindowId_PowerButtonAnimationContainer;
|
| // A list of all the above valid container IDs. Add any new ID to this list.
|
| // This list is needed to validate we have no duplicate IDs.
|
| const int32_t kAllShellContainerIds[] = {
|
| - kShellWindowId_NonLockScreenContainersContainer,
|
| - kShellWindowId_LockScreenContainersContainer,
|
| - kShellWindowId_LockScreenRelatedContainersContainer,
|
| - kShellWindowId_UnparentedControlContainer,
|
| - kShellWindowId_WallpaperContainer,
|
| - kShellWindowId_VirtualKeyboardContainer,
|
| - kShellWindowId_DefaultContainer,
|
| - kShellWindowId_AlwaysOnTopContainer,
|
| - kShellWindowId_ShelfContainer,
|
| - kShellWindowId_ShelfBubbleContainer,
|
| - kShellWindowId_PanelContainer,
|
| - kShellWindowId_AppListContainer,
|
| - kShellWindowId_SystemModalContainer,
|
| - kShellWindowId_LockScreenWallpaperContainer,
|
| - kShellWindowId_LockScreenContainer,
|
| - kShellWindowId_LockSystemModalContainer,
|
| - kShellWindowId_StatusContainer,
|
| - kShellWindowId_ImeWindowParentContainer,
|
| - kShellWindowId_MenuContainer,
|
| - kShellWindowId_DragImageAndTooltipContainer,
|
| - kShellWindowId_SettingBubbleContainer,
|
| - kShellWindowId_OverlayContainer,
|
| - kShellWindowId_PhantomWindow,
|
| - kShellWindowId_MouseCursorContainer,
|
| - kShellWindowId_PowerButtonAnimationContainer,
|
| + kShellWindowId_ScreenRotationContainer,
|
| + kShellWindowId_NonLockScreenContainersContainer,
|
| + kShellWindowId_LockScreenContainersContainer,
|
| + kShellWindowId_LockScreenRelatedContainersContainer,
|
| + kShellWindowId_UnparentedControlContainer,
|
| + kShellWindowId_WallpaperContainer,
|
| + kShellWindowId_VirtualKeyboardContainer,
|
| + kShellWindowId_DefaultContainer,
|
| + kShellWindowId_AlwaysOnTopContainer,
|
| + kShellWindowId_ShelfContainer,
|
| + kShellWindowId_ShelfBubbleContainer,
|
| + kShellWindowId_PanelContainer,
|
| + kShellWindowId_AppListContainer,
|
| + kShellWindowId_SystemModalContainer,
|
| + kShellWindowId_LockScreenWallpaperContainer,
|
| + kShellWindowId_LockScreenContainer,
|
| + kShellWindowId_LockSystemModalContainer,
|
| + kShellWindowId_StatusContainer,
|
| + kShellWindowId_ImeWindowParentContainer,
|
| + kShellWindowId_MenuContainer,
|
| + kShellWindowId_DragImageAndTooltipContainer,
|
| + kShellWindowId_SettingBubbleContainer,
|
| + kShellWindowId_OverlayContainer,
|
| + kShellWindowId_PhantomWindow,
|
| + kShellWindowId_MouseCursorContainer,
|
| + kShellWindowId_PowerButtonAnimationContainer,
|
| };
|
|
|
| // These are the list of container ids of containers which may contain windows
|
|
|