Separated alt-tab window cycle from overview mode

ash/wm/overview/window_overview.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_overview.h"
 
 #include <algorithm>
 
 #include "ash/accessibility_delegate.h"
 #include "ash/metrics/user_metrics_recorder.h"
@@ skipping 102 matching lines @@
   delete this;
 }
 
 void CleanupWidgetAfterAnimationObserver::OnLayerAnimationScheduled(
     ui::LayerAnimationSequence* sequence) {
 }
 
 }  // namespace
 
 WindowOverview::WindowOverview(WindowSelector* window_selector,
-                               WindowSelectorItemList* windows,
-                               aura::Window* single_root_window)
+                               WindowSelectorItemList* windows)
     : window_selector_(window_selector),
       windows_(windows),
       selection_index_(0),
-      single_root_window_(single_root_window),
       overview_start_time_(base::Time::Now()),
       cursor_client_(NULL) {
   Shell* shell = Shell::GetInstance();
   shell->OnOverviewModeStarting();
   for (WindowSelectorItemList::iterator iter = windows_->begin();
        iter != windows_->end(); ++iter) {
     (*iter)->PrepareForOverview();
   }
   PositionWindows(/* animate */ true);
   DCHECK(!windows_->empty());
   cursor_client_ = aura::client::GetCursorClient(
       windows_->front()->GetRootWindow());
   if (cursor_client_) {
     cursor_client_->SetCursor(ui::kCursorPointer);
     cursor_client_->ShowCursor();
     // TODO(flackr): Only prevent cursor changes for windows in the overview.
     // This will be easier to do without exposing the overview mode code if the
     // cursor changes are moved to ToplevelWindowEventHandler::HandleMouseMoved
     // as suggested there.
     cursor_client_->LockCursor();
   }
   shell->PrependPreTargetHandler(this);
   shell->GetScreen()->AddObserver(this);
   shell->metrics()->RecordUserMetricsAction(UMA_WINDOW_OVERVIEW);
   HideAndTrackNonOverviewWindows();
-  // Send an a11y alert only if the overview was activated by the user.
-  if (window_selector_->mode() == WindowSelector::OVERVIEW) {
-    shell->accessibility_delegate()->TriggerAccessibilityAlert(
-        A11Y_ALERT_WINDOW_OVERVIEW_MODE_ENTERED);
-  }
+  // Send an a11y alert
+  shell->accessibility_delegate()->TriggerAccessibilityAlert(
+      A11Y_ALERT_WINDOW_OVERVIEW_MODE_ENTERED);
 }
 
 WindowOverview::~WindowOverview() {
   const aura::WindowTracker::Windows hidden_windows = hidden_windows_.windows();
   for (aura::WindowTracker::Windows::const_iterator iter =
        hidden_windows.begin(); iter != hidden_windows.end(); ++iter) {
     ui::ScopedLayerAnimationSettings settings(
         (*iter)->layer()->GetAnimator());
     settings.SetTransitionDuration(base::TimeDelta::FromMilliseconds(
         ScopedTransformOverviewWindow::kTransitionMilliseconds));
@@ skipping 78 matching lines @@
     InitializeSelectionWidget();
     selection_widget_->SetBounds(target_bounds);
   }
   selection_index_ = index;
 }
 
 void WindowOverview::OnWindowsChanged() {
   PositionWindows(/* animate */ true);
 }
 
-void WindowOverview::MoveToSingleRootWindow(aura::Window* root_window) {
-  single_root_window_ = root_window;
-  PositionWindows(/* animate */ true);
-}
-
 void WindowOverview::OnKeyEvent(ui::KeyEvent* event) {
   if (GetTargetedWindow(static_cast<aura::Window*>(event->target())))
     event->StopPropagation();
   if (event->type() != ui::ET_KEY_PRESSED)
     return;
 
   if (event->key_code() == ui::VKEY_ESCAPE)
     window_selector_->CancelSelection();
 }
 
@@ skipping 99 matching lines @@
         ui::LayerAnimator::IMMEDIATELY_ANIMATE_TO_NEW_TARGET);
     (*iter)->Hide();
     // Hiding the window can result in it being destroyed.
     if (!hidden_windows_.Contains(*iter))
       continue;
     (*iter)->layer()->SetOpacity(0);
   }
 }
 
 void WindowOverview::PositionWindows(bool animate) {
-  if (single_root_window_) {
-    std::vector<WindowSelectorItem*> windows;
-    for (WindowSelectorItemList::iterator iter = windows_->begin();
-         iter != windows_->end(); ++iter) {
-      windows.push_back(*iter);
-    }
-    PositionWindowsOnRoot(single_root_window_, windows, animate);
-  } else {
-    aura::Window::Windows root_window_list = Shell::GetAllRootWindows();
-    for (size_t i = 0; i < root_window_list.size(); ++i)
-      PositionWindowsFromRoot(root_window_list[i], animate);
-  }
+  aura::Window::Windows root_window_list = Shell::GetAllRootWindows();
+  for (size_t i = 0; i < root_window_list.size(); ++i)
+    PositionWindowsFromRoot(root_window_list[i], animate);
 }
 
 void WindowOverview::PositionWindowsFromRoot(aura::Window* root_window,
                                              bool animate) {
   std::vector<WindowSelectorItem*> windows;
   for (WindowSelectorItemList::iterator iter = windows_->begin();
        iter != windows_->end(); ++iter) {
     if ((*iter)->GetRootWindow() == root_window)
       windows.push_back(*iter);
   }
@@ skipping 45 matching lines @@
 }
 
 void WindowOverview::InitializeSelectionWidget() {
   selection_widget_.reset(new views::Widget);
   views::Widget::InitParams params;
   params.type = views::Widget::InitParams::TYPE_POPUP;
   params.can_activate = false;
   params.keep_on_top = false;
   params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   params.opacity = views::Widget::InitParams::OPAQUE_WINDOW;
-  params.parent = Shell::GetContainer(single_root_window_
-                                          ? single_root_window_
-                                          : windows_->front()->GetRootWindow(),
+  params.parent = Shell::GetContainer(windows_->front()->GetRootWindow(),
                                       kShellWindowId_DefaultContainer);
   params.accept_events = false;
   selection_widget_->set_focus_on_creation(false);
   selection_widget_->Init(params);
   views::View* content_view = new views::View;
   content_view->set_background(
       views::Background::CreateSolidBackground(kWindowOverviewSelectionColor));
   selection_widget_->SetContentsView(content_view);
   selection_widget_->Show();
   selection_widget_->GetNativeWindow()->parent()->StackChildAtBottom(
       selection_widget_->GetNativeWindow());
   selection_widget_->GetNativeWindow()->layer()->SetOpacity(
       kWindowOverviewSelectionOpacity);
 }
 
 gfx::Rect WindowOverview::GetSelectionBounds(size_t index) {
   gfx::Rect bounds((*windows_)[index]->bounds());
   bounds.Inset(-kWindowOverviewSelectionPadding,
                -kWindowOverviewSelectionPadding);
   return bounds;
 }
 
 }  // namespace ash