diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-03 18:39:26 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-03 18:39:26 +0000 |
| commit | 8fd386fa4ea955ec1a0c6b3e42fd30baf17fde80 (patch) | |
| tree | f8ccafb02305bcecc9d18d7ac943029d442ed135 /ash/shell_window_ids.h | |
| parent | 66edcb54dd11f62cb6b255992a3bd63744953cc4 (diff) | |
| download | chromium_src-8fd386fa4ea955ec1a0c6b3e42fd30baf17fde80.zip chromium_src-8fd386fa4ea955ec1a0c6b3e42fd30baf17fde80.tar.gz chromium_src-8fd386fa4ea955ec1a0c6b3e42fd30baf17fde80.tar.bz2 | |
Revert 149869 because it broke ash_unittests on win_aura and linux_chromeos.
"""
2nd display should show the same background as login/lock screen:
Added special container for background on lock screen.
Background view can now be created in specific container.
Disabled lock screen wallpaper implementation based on serving PNG image via data source.
BUG=136853,137581
TEST=Lock screen on multimonitor configuration. Check that windows on secondary display are hidden with background.
Review URL: https://chromiumcodereview.appspot.com/10810039
TBR=antrim@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10829173
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149878 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell_window_ids.h')
| -rw-r--r-- | ash/shell_window_ids.h | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/ash/shell_window_ids.h b/ash/shell_window_ids.h index 8ac0f18..695ed8d 100644 --- a/ash/shell_window_ids.h +++ b/ash/shell_window_ids.h @@ -57,31 +57,28 @@ const int kShellWindowId_SystemModalContainer = 10; // the AppList and SystemModal dialogs. const int kShellWindowId_InputMethodContainer = 11; -// The container for the lock screen background. -const int kShellWindowId_LockScreenBackgroundContainer = 12; - // The container for the lock screen. -const int kShellWindowId_LockScreenContainer = 13; +const int kShellWindowId_LockScreenContainer = 12; // The container for the lock screen modal windows. -const int kShellWindowId_LockSystemModalContainer = 14; +const int kShellWindowId_LockSystemModalContainer = 13; // The container for the status area. -const int kShellWindowId_StatusContainer = 15; +const int kShellWindowId_StatusContainer = 14; // The container for menus. -const int kShellWindowId_MenuContainer = 16; +const int kShellWindowId_MenuContainer = 15; // The container for drag/drop images and tooltips. -const int kShellWindowId_DragImageAndTooltipContainer = 17; +const int kShellWindowId_DragImageAndTooltipContainer = 16; // The container for bubbles briefly overlaid onscreen to show settings changes // (volume, brightness, etc.). -const int kShellWindowId_SettingBubbleContainer = 18; +const int kShellWindowId_SettingBubbleContainer = 17; // The container for special components overlaid onscreen, such as the // region selector for partial screenshots. -const int kShellWindowId_OverlayContainer = 19; +const int kShellWindowId_OverlayContainer = 18; } // namespace internal |