Change overview mode to so that docked panel windows are not grouped together.

ash/wm/overview/scoped_transform_overview_window.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/scoped_transform_overview_window.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "ash/screen_util.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/overview/scoped_overview_animation_settings.h"
-#include "ash/wm/overview/scoped_window_copy.h"
 #include "ash/wm/overview/window_selector_item.h"
 #include "ash/wm/window_state.h"
 #include "ash/wm/window_util.h"
 #include "base/macros.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/window.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/gfx/animation/tween.h"
 #include "ui/gfx/transform_util.h"
@@ skipping 144 matching lines @@
         aura::Window* window)
     : window_(window),
       activate_button_(new TransparentActivateWindowButton(
           window_->GetRootWindow(), this)),
       minimized_(window->GetProperty(aura::client::kShowStateKey) ==
                  ui::SHOW_STATE_MINIMIZED),
       ignored_by_shelf_(wm::GetWindowState(window)->ignored_by_shelf()),
       overview_started_(false),
       original_transform_(window->layer()->GetTargetTransform()),
       original_opacity_(window->layer()->GetTargetOpacity()) {
+  DCHECK(window_);
 }
 
 ScopedTransformOverviewWindow::~ScopedTransformOverviewWindow() {
-  if (window_) {
-    ScopedAnimationSettings animation_settings_list;
-    BeginScopedAnimation(
-        OverviewAnimationType::OVERVIEW_ANIMATION_RESTORE_WINDOW,
-        &animation_settings_list);
-    SetTransform(window()->GetRootWindow(), original_transform_);
+}
 
-    ScopedOverviewAnimationSettings animation_settings(
-        OverviewAnimationType::OVERVIEW_ANIMATION_LAY_OUT_SELECTOR_ITEMS,
-        window_);
-    gfx::Transform transform;
-    if (minimized_ && window_->GetProperty(aura::client::kShowStateKey) !=
-        ui::SHOW_STATE_MINIMIZED) {
-      // Setting opacity 0 and visible false ensures that the property change
-      // to SHOW_STATE_MINIMIZED will not animate the window from its original
-      // bounds to the minimized position.
-      // Hiding the window needs to be done before the target opacity is 0,
-      // otherwise the layer's visibility will not be updated
-      // (See VisibilityController::UpdateLayerVisibility).
-      window_->Hide();
-      window_->layer()->SetOpacity(0);
-      window_->SetProperty(aura::client::kShowStateKey,
-                           ui::SHOW_STATE_MINIMIZED);
-    }
-    wm::GetWindowState(window_)->set_ignored_by_shelf(ignored_by_shelf_);
-    SetOpacity(original_opacity_);
+void ScopedTransformOverviewWindow::RestoreWindow() {
+  ScopedAnimationSettings animation_settings_list;
+  BeginScopedAnimation(
+      OverviewAnimationType::OVERVIEW_ANIMATION_RESTORE_WINDOW,
+      &animation_settings_list);
+  SetTransform(window()->GetRootWindow(), original_transform_);
+
+  ScopedOverviewAnimationSettings animation_settings(
+      OverviewAnimationType::OVERVIEW_ANIMATION_LAY_OUT_SELECTOR_ITEMS,
+      window_);
+  gfx::Transform transform;
+  if (minimized_ && window_->GetProperty(aura::client::kShowStateKey) !=
+      ui::SHOW_STATE_MINIMIZED) {
+    // Setting opacity 0 and visible false ensures that the property change
+    // to SHOW_STATE_MINIMIZED will not animate the window from its original
+    // bounds to the minimized position.
+    // Hiding the window needs to be done before the target opacity is 0,
+    // otherwise the layer's visibility will not be updated
+    // (See VisibilityController::UpdateLayerVisibility).
+    window_->Hide();
+    window_->layer()->SetOpacity(0);
+    window_->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_MINIMIZED);
   }
+  wm::GetWindowState(window_)->set_ignored_by_shelf(ignored_by_shelf_);
+  SetOpacity(original_opacity_);
 }
 
 void ScopedTransformOverviewWindow::BeginScopedAnimation(
     OverviewAnimationType animation_type,
     ScopedAnimationSettings* animation_settings) {
   for (const auto& window : GetTransientTreeIterator(window_)) {
     animation_settings->push_back(
         new ScopedOverviewAnimationSettings(animation_type, window));
   }
 }
 
 bool ScopedTransformOverviewWindow::Contains(const aura::Window* target) const {
   for (const auto& window : GetTransientTreeIterator(window_)) {
     if (window->Contains(target))
       return true;
   }
   return false;
 }
 
 gfx::Rect ScopedTransformOverviewWindow::GetTargetBoundsInScreen() const {
   gfx::Rect bounds;
   for (const auto& window : GetTransientTreeIterator(window_)) {
     bounds.Union(ScreenUtil::ConvertRectToScreen(window->parent(),
                                                  window->GetTargetBounds()));
   }
   return bounds;
 }
 
-void ScopedTransformOverviewWindow::RestoreWindow() {
+void ScopedTransformOverviewWindow::ShowWindowIfMinimized() {
   if (minimized_ && window_->GetProperty(aura::client::kShowStateKey) ==
       ui::SHOW_STATE_MINIMIZED) {
     window_->Show();
   }
 }
 
-void ScopedTransformOverviewWindow::RestoreWindowOnExit() {
-  minimized_ = false;
-  original_transform_ = gfx::Transform();
-  original_opacity_ = kRestoreWindowOpacity;
-}
-
-void ScopedTransformOverviewWindow::OnWindowDestroyed() {
-  window_ = nullptr;
+void ScopedTransformOverviewWindow::ShowWindowOnExit() {
+  if (minimized_) {
+    minimized_ = false;
+    original_transform_ = gfx::Transform();
+    original_opacity_ = kRestoreWindowOpacity;
+  }
 }
 
 gfx::Rect ScopedTransformOverviewWindow::ShrinkRectToFitPreservingAspectRatio(
     const gfx::Rect& rect,
     const gfx::Rect& bounds) {
   DCHECK(!rect.IsEmpty());
   DCHECK(!bounds.IsEmpty());
   float scale = std::min(1.0f,
       std::min(static_cast<float>(bounds.width()) / rect.width(),
                static_cast<float>(bounds.height()) / rect.height()));
@@ skipping 47 matching lines @@
 
 void ScopedTransformOverviewWindow::Close() {
   aura::Window* window = GetTransientRoot(window_);
   views::Widget::GetWidgetForNativeView(window)->Close();
 }
 
 void ScopedTransformOverviewWindow::PrepareForOverview() {
   DCHECK(!overview_started_);
   overview_started_ = true;
   wm::GetWindowState(window_)->set_ignored_by_shelf(true);
-  RestoreWindow();
+  ShowWindowIfMinimized();
 }
 
 }  // namespace ash