Relayout windows in overview when display size changes.

ash/wm/overview/window_selector_item.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/wm/overview/window_selector_item.h"
 
 #include "ash/screen_util.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/overview/scoped_transform_overview_window.h"
@@ skipping 63 matching lines @@
 
 WindowSelectorItem::WindowSelectorItem()
     : root_window_(NULL),
       in_bounds_update_(false) {
 }
 
 WindowSelectorItem::~WindowSelectorItem() {
 }
 
 void WindowSelectorItem::SetBounds(aura::Window* root_window,
-                                   const gfx::Rect& target_bounds) {
+                                   const gfx::Rect& target_bounds,
+                                   bool animate) {
   if (in_bounds_update_)
     return;
   base::AutoReset<bool> auto_reset_in_bounds_update(&in_bounds_update_, true);
   root_window_ = root_window;
   target_bounds_ = target_bounds;
-  SetItemBounds(root_window, target_bounds, true);
+  SetItemBounds(root_window, target_bounds, animate);
   // TODO(nsatragno): Handle window title updates.
-  UpdateWindowLabels(target_bounds, root_window);
+  UpdateWindowLabels(target_bounds, root_window, animate);
 }
 
 void WindowSelectorItem::RecomputeWindowTransforms() {
   if (in_bounds_update_ || target_bounds_.IsEmpty())
     return;
   DCHECK(root_window_);
   base::AutoReset<bool> auto_reset_in_bounds_update(&in_bounds_update_, true);
   SetItemBounds(root_window_, target_bounds_, false);
 }
 
 void WindowSelectorItem::UpdateWindowLabels(const gfx::Rect& window_bounds,
-                                            aura::Window* root_window) {
+                                            aura::Window* root_window,
+                                            bool animate) {
   gfx::Rect converted_bounds = ScreenUtil::ConvertRectFromScreen(root_window,
                                                                  window_bounds);
   gfx::Rect label_bounds(converted_bounds.x(),
                          converted_bounds.bottom(),
                          converted_bounds.width(),
                          0);
 
   // If the root window has changed, force the window label to be recreated
   // and faded in on the new root window.
   if (window_label_ &&
@@ skipping 17 matching lines @@
             ScopedTransformOverviewWindow::kTransitionMilliseconds),
         ui::LayerAnimationElement::OPACITY);
 
     ui::ScopedLayerAnimationSettings settings(layer->GetAnimator());
     settings.SetPreemptionStrategy(
         ui::LayerAnimator::REPLACE_QUEUED_ANIMATIONS);
     settings.SetTransitionDuration(base::TimeDelta::FromMilliseconds(
         kFadeInMilliseconds));
     layer->SetOpacity(1);
   } else {
-    ui::ScopedLayerAnimationSettings settings(
-        window_label_->GetNativeWindow()->layer()->GetAnimator());
-    settings.SetPreemptionStrategy(
-        ui::LayerAnimator::IMMEDIATELY_ANIMATE_TO_NEW_TARGET);
-    settings.SetTransitionDuration(base::TimeDelta::FromMilliseconds(
-        ScopedTransformOverviewWindow::kTransitionMilliseconds));
     label_bounds.set_height(window_label_->
                             GetContentsView()->GetPreferredSize().height());
-    window_label_->GetNativeWindow()->SetBounds(label_bounds);
+    if (animate) {
+      ui::ScopedLayerAnimationSettings settings(
+          window_label_->GetNativeWindow()->layer()->GetAnimator());
+      settings.SetPreemptionStrategy(
+          ui::LayerAnimator::IMMEDIATELY_ANIMATE_TO_NEW_TARGET);
+      settings.SetTransitionDuration(base::TimeDelta::FromMilliseconds(
+          ScopedTransformOverviewWindow::kTransitionMilliseconds));
+      window_label_->GetNativeWindow()->SetBounds(label_bounds);
+    } else {
+      window_label_->GetNativeWindow()->SetBounds(label_bounds);
+    }
   }
 
 }
 
 }  // namespace ash