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

ash/wm/overview/window_selector.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.h"
 
 #include <algorithm>
 #include <set>
 #include <vector>
 
@@ skipping 74 matching lines @@
 };
 
 // A comparator for locating a selectable window given a targeted window.
 struct WindowSelectorItemTargetComparator
     : public std::unary_function<WindowSelectorItem*, bool> {
   explicit WindowSelectorItemTargetComparator(const aura::Window* target_window)
       : target(target_window) {
   }
 
   bool operator()(WindowSelectorItem* window) const {
-    return window->Contains(target);
+    return window->GetWindow() == target;
   }
 
   const aura::Window* target;
 };
 
 // A comparator for locating a selector item for a given root.
 struct WindowSelectorItemForRoot
     : public std::unary_function<WindowSelectorItem*, bool> {
   explicit WindowSelectorItemForRoot(const aura::Window* root)
       : root_window(root) {
@@ skipping 104 matching lines @@
   textfield->RequestFocus();
 
   return widget;
 }
 
 }  // namespace
 
 const int WindowSelector::kTextFilterBottomEdge =
     kTextFilterDistanceFromTop + kTextFilterHeight;
 
-WindowSelector::WindowSelector(const WindowList& windows,
-                               WindowSelectorDelegate* delegate)
+WindowSelector::WindowSelector(WindowSelectorDelegate* delegate)
     : delegate_(delegate),
       restore_focus_window_(aura::client::GetFocusClient(
           Shell::GetPrimaryRootWindow())->GetFocusedWindow()),
       ignore_activations_(false),
       selected_grid_index_(0),
       overview_start_time_(base::Time::Now()),
       num_key_presses_(0),
       num_items_(0),
       showing_selection_widget_(false),
       text_filter_string_length_(0),
-      num_times_textfield_cleared_(0) {
+      num_times_textfield_cleared_(0),
+      restoring_minimized_windows_(false) {
   DCHECK(delegate_);
+}
+
+WindowSelector::~WindowSelector() {
+}
+
+void WindowSelector::Init(const WindowList& windows) {
   Shell* shell = Shell::GetInstance();
   shell->OnOverviewModeStarting();
 
   if (restore_focus_window_)
     restore_focus_window_->AddObserver(this);
 
   const aura::Window::Windows root_windows = Shell::GetAllRootWindows();
   for (aura::Window::Windows::const_iterator iter = root_windows.begin();
        iter != root_windows.end(); iter++) {
     // Observed switchable containers for newly created windows on all root
@@ skipping 11 matching lines @@
         Shell::GetContainer(*iter, kShellWindowId_PanelContainer)
             ->layout_manager())->SetShowCalloutWidgets(false);
 
     scoped_ptr<WindowGrid> grid(new WindowGrid(*iter, windows, this));
     if (grid->empty())
       continue;
     num_items_ += grid->size();
     grid_list_.push_back(grid.release());
   }
 
-  // Do not call PrepareForOverview until all items are added to window_list_ as
-  // we don't want to cause any window updates until all windows in overview
-  // are observed. See http://crbug.com/384495.
-  for (ScopedVector<WindowGrid>::iterator iter = grid_list_.begin();
-       iter != grid_list_.end(); ++iter) {
-    (*iter)->PrepareForOverview();
-    (*iter)->PositionWindows(true);
+  {
+    // The calls to WindowGrid::PrepareForOverview() and CreateTextFilter(...)
+    // requires some LayoutManagers (ie PanelLayoutManager) to perform layouts
+    // so that windows are correctly visible and properly animated in overview
+    // mode. Otherwise these layouts should be suppressed during overview mode
+    // so they don't conflict with overview mode animations. The
+    // |restoring_minimized_windows_| flag enables the PanelLayoutManager to
+    // make this decision.
+    base::AutoReset<bool> auto_restoring_minimized_windows_(
+        &restoring_minimized_windows_, true);
+
+    // Do not call PrepareForOverview until all items are added to window_list_
+    // as we don't want to cause any window updates until all windows in
+    // overview are observed. See http://crbug.com/384495.
+    for (ScopedVector<WindowGrid>::iterator iter = grid_list_.begin();

[jonross, 2015/01/15 13:37:47]

switch to for(auto iter : grid_list_)

[bruthig, 2015/01/15 18:27:25]

Done.

+         iter != grid_list_.end(); ++iter) {
+      (*iter)->PrepareForOverview();
+      (*iter)->PositionWindows(true);
+    }
+
+    text_filter_widget_.reset(
+        CreateTextFilter(this, Shell::GetPrimaryRootWindow()));
   }
 
   DCHECK(!grid_list_.empty());
   UMA_HISTOGRAM_COUNTS_100("Ash.WindowSelector.Items", num_items_);
 
-  text_filter_widget_.reset(
-      CreateTextFilter(this, Shell::GetPrimaryRootWindow()));
-
   shell->activation_client()->AddObserver(this);
 
   shell->GetScreen()->AddObserver(this);
   shell->metrics()->RecordUserMetricsAction(UMA_WINDOW_OVERVIEW);
   HideAndTrackNonOverviewWindows();
   // Send an a11y alert.
   shell->accessibility_delegate()->TriggerAccessibilityAlert(
       ui::A11Y_ALERT_WINDOW_OVERVIEW_MODE_ENTERED);
 
   UpdateShelfVisibility();
 }
 
-WindowSelector::~WindowSelector() {
+void WindowSelector::Shutdown() {
   Shell* shell = Shell::GetInstance();
 
   ResetFocusRestoreWindow(true);
   for (std::set<aura::Window*>::iterator iter = observed_windows_.begin();
        iter != observed_windows_.end(); ++iter) {
     (*iter)->RemoveObserver(this);
   }
   shell->activation_client()->RemoveObserver(this);
 
   aura::Window::Windows root_windows = Shell::GetAllRootWindows();
@@ skipping 99 matching lines @@
       if (!grid_list_[selected_grid_index_]->is_selecting())
         return false;
       UMA_HISTOGRAM_COUNTS_100("Ash.WindowSelector.ArrowKeyPresses",
                                num_key_presses_);
       UMA_HISTOGRAM_CUSTOM_COUNTS(
           "Ash.WindowSelector.KeyPressesOverItemsRatio",
           (num_key_presses_ * 100) / num_items_, 1, 300, 30);
       Shell::GetInstance()->metrics()->RecordUserMetricsAction(
           UMA_WINDOW_OVERVIEW_ENTER_KEY);
       wm::GetWindowState(grid_list_[selected_grid_index_]->
-                         SelectedWindow()->SelectionWindow())->Activate();
+                         SelectedWindow()->GetWindow())->Activate();
       break;
     default:
       // Not a key we are interested in, allow the textfield to handle it.
       return false;
   }
   return true;
 }
 
 void WindowSelector::OnDisplayAdded(const gfx::Display& display) {
 }
@@ skipping 172 matching lines @@
   for (size_t i = 0;
       i <= grid_list_.size() &&
       grid_list_[selected_grid_index_]->Move(direction, animate); i++) {
     // TODO(flackr): If there are more than two monitors, move between grids
     // in the requested direction.
     selected_grid_index_ = (selected_grid_index_ + 1) % grid_list_.size();
   }
 }
 
 }  // namespace ash