summaryrefslogtreecommitdiffstats
path: root/ash/wm/root_window_layout_manager.cc
diff options
context:
space:
mode:
authorderat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-23 19:06:14 +0000
committerderat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-23 19:06:14 +0000
commitf52a0729191ddef51bfa54aec61a3cc0083e2570 (patch)
tree95c40642fc37003097d57b3f70c43c47fb7166a1 /ash/wm/root_window_layout_manager.cc
parentcd609cbecfa081ec5aff94eb99022a3433827e1b (diff)
downloadchromium_src-f52a0729191ddef51bfa54aec61a3cc0083e2570.zip
chromium_src-f52a0729191ddef51bfa54aec61a3cc0083e2570.tar.gz
chromium_src-f52a0729191ddef51bfa54aec61a3cc0083e2570.tar.bz2
ash: Create new containers for PowerButtonController.
This nests ash's existing containers inside of three new higher-level containers-of-containers. The new higher-level containers can be animated by PowerButtonController without messing up transformations that have already been applied to the lower-level containers. BUG=114953 TEST=manual: locked and unlocked screen in compact mode with multiple browser windows Review URL: http://codereview.chromium.org/9428056 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@123288 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/root_window_layout_manager.cc')
-rw-r--r--ash/wm/root_window_layout_manager.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/ash/wm/root_window_layout_manager.cc b/ash/wm/root_window_layout_manager.cc
index f320ab8..e237737 100644
--- a/ash/wm/root_window_layout_manager.cc
+++ b/ash/wm/root_window_layout_manager.cc
@@ -46,9 +46,15 @@ void RootWindowLayoutManager::OnWindowResized() {
// resize to fit the new workspace area.
Shell::GetInstance()->SetWindowModeForMonitorSize(fullscreen_bounds.size());
+ // Resize both our immediate children (the containers-of-containers animated
+ // by PowerButtonController) and their children (the actual containers).
aura::Window::Windows::const_iterator i;
- for (i = owner_->children().begin(); i != owner_->children().end(); ++i)
+ for (i = owner_->children().begin(); i != owner_->children().end(); ++i) {
(*i)->SetBounds(fullscreen_bounds);
+ aura::Window::Windows::const_iterator j;
+ for (j = (*i)->children().begin(); j != (*i)->children().end(); ++j)
+ (*j)->SetBounds(fullscreen_bounds);
+ }
if (background_widget_)
background_widget_->SetBounds(fullscreen_bounds);