[ash-md] Allows docked windows to be selected in overview mode

ash/common/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/common/wm/overview/scoped_transform_overview_window.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "ash/common/material_design/material_design_controller.h"
@@ skipping 231 matching lines @@
 }
 
 base::Closure ScopedTransformOverviewWindow::OverviewContentMask::
     PrepareForLayerBoundsChange() {
   return base::Closure();
 }
 
 ScopedTransformOverviewWindow::ScopedTransformOverviewWindow(WmWindow* window)
     : window_(window),
       determined_original_window_shape_(false),
-      minimized_(window->GetShowState() == ui::SHOW_STATE_MINIMIZED),
+      original_visibility_(
+          window->GetWindowState()->GetStateType() ==
+                  wm::WINDOW_STATE_TYPE_DOCKED_MINIMIZED
+              ? ORIGINALLY_DOCKED_MINIMIZED
+              : (window->GetShowState() == ui::SHOW_STATE_MINIMIZED
+                     ? ORIGINALLY_MINIMIZED
+                     : ORIGINALLY_VISIBLE)),
       ignored_by_shelf_(window->GetWindowState()->ignored_by_shelf()),
       overview_started_(false),
       original_transform_(window->GetTargetTransform()),
       original_opacity_(window->GetTargetOpacity()),
       weak_ptr_factory_(this) {}
 
 ScopedTransformOverviewWindow::~ScopedTransformOverviewWindow() {}
 
 void ScopedTransformOverviewWindow::RestoreWindow() {
   ScopedAnimationSettings animation_settings_list;
   BeginScopedAnimation(OverviewAnimationType::OVERVIEW_ANIMATION_RESTORE_WINDOW,
                        &animation_settings_list);
   SetTransform(window()->GetRootWindow(), original_transform_, 0);
 
   std::unique_ptr<ScopedOverviewAnimationSettings> animation_settings =
       CreateScopedOverviewAnimationSettings(
           OverviewAnimationType::OVERVIEW_ANIMATION_LAY_OUT_SELECTOR_ITEMS,
           window_);
   gfx::Transform transform;
-  if (minimized_ && window_->GetShowState() != ui::SHOW_STATE_MINIMIZED) {
+  if ((original_visibility_ == ORIGINALLY_MINIMIZED &&
+       window_->GetShowState() != ui::SHOW_STATE_MINIMIZED) ||
+      (original_visibility_ == ORIGINALLY_DOCKED_MINIMIZED &&
+       window_->GetWindowState()->GetStateType() !=
+           wm::WINDOW_STATE_TYPE_DOCKED_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_->SetOpacity(0);
     window_->SetShowState(ui::SHOW_STATE_MINIMIZED);
   }
@@ skipping 41 matching lines @@
         window->GetType() != ui::wm::WINDOW_TYPE_PANEL) {
       continue;
     }
     bounds.Union(
         window->GetParent()->ConvertRectToScreen(window->GetTargetBounds()));
   }
   return bounds;
 }
 
 void ScopedTransformOverviewWindow::ShowWindowIfMinimized() {
-  if (minimized_ && window_->GetShowState() == ui::SHOW_STATE_MINIMIZED)
+  if ((original_visibility_ == ORIGINALLY_MINIMIZED &&
+       window_->GetShowState() == ui::SHOW_STATE_MINIMIZED) ||
+      (original_visibility_ == ORIGINALLY_DOCKED_MINIMIZED &&
+       window_->GetWindowState()->GetStateType() ==
+           wm::WINDOW_STATE_TYPE_DOCKED_MINIMIZED)) {
     window_->Show();
+  }
 }
 
 void ScopedTransformOverviewWindow::ShowWindowOnExit() {
-  if (minimized_) {
-    minimized_ = false;
+  if (original_visibility_ != ORIGINALLY_VISIBLE) {
+    original_visibility_ = ORIGINALLY_VISIBLE;
     original_transform_ = gfx::Transform();
     original_opacity_ = kRestoreWindowOpacity;
   }
 }
 
 void ScopedTransformOverviewWindow::OnWindowDestroyed() {
   window_ = nullptr;
 }
 
 float ScopedTransformOverviewWindow::GetItemScale(const gfx::Size& source,
@@ skipping 129 matching lines @@
   if (parent_window)
     parent_window->CloseWidget();
 }
 
 // static
 void ScopedTransformOverviewWindow::SetImmediateCloseForTests() {
   immediate_close_for_tests = true;
 }
 
 }  // namespace ash