diff options
| author | skuhne@chromium.org <skuhne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-07 22:08:40 +0000 |
|---|---|---|
| committer | skuhne@chromium.org <skuhne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-07 22:08:40 +0000 |
| commit | 36a7e0e42983e5b2ea4623a763be3a62f75b1cb6 (patch) | |
| tree | 6130f5ebadbfe0ea0d6a40243d2503dcae665c82 /ash/wm | |
| parent | c931465a982836e6399a853e03cfde4054d486d6 (diff) | |
| download | chromium_src-36a7e0e42983e5b2ea4623a763be3a62f75b1cb6.zip chromium_src-36a7e0e42983e5b2ea4623a763be3a62f75b1cb6.tar.gz chromium_src-36a7e0e42983e5b2ea4623a763be3a62f75b1cb6.tar.bz2 | |
Suppress automated window resizes through inset changes when entering the lock screen
BUG=173127
TEST=visual
Review URL: https://chromiumcodereview.appspot.com/12223030
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181370 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm')
| -rw-r--r-- | ash/wm/workspace/workspace_layout_manager.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/ash/wm/workspace/workspace_layout_manager.cc b/ash/wm/workspace/workspace_layout_manager.cc index 38276ac..9888823 100644 --- a/ash/wm/workspace/workspace_layout_manager.cc +++ b/ash/wm/workspace/workspace_layout_manager.cc @@ -280,6 +280,12 @@ void WorkspaceLayoutManager::ShowStateChanged( void WorkspaceLayoutManager::AdjustWindowSizesForScreenChange( AdjustWindowReason reason) { + // Don't do any adjustments of the insets while we are in screen locked mode. + // This would happen if the launcher was auto hidden before the login screen + // was shown and then gets shown when the login screen gets presented. + if (reason == ADJUST_WINDOW_DISPLAY_INSETS_CHANGED && + Shell::GetInstance()->IsScreenLocked()) + return; work_area_ = ScreenAsh::GetDisplayWorkAreaBoundsInParent( workspace_->window()->parent()); // If a user plugs an external display into a laptop running Aura the |