a

athena/wm/window_manager_impl.cc

 // Copyright 2014 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 "athena/wm/window_manager_impl.h"
 
 #include <algorithm>
 
 #include "athena/common/container_priorities.h"
 #include "athena/screen/public/screen_manager.h"
@@ skipping 163 matching lines @@
   return overview_;
 }
 
 void WindowManagerImpl::SetInOverview(bool active) {
   bool in_overview = !!overview_;
   if (active == in_overview)
     return;
 
   bezel_controller_->set_left_right_delegate(
       active ? NULL : split_view_controller_.get());
+
+  aura::Window::Windows window_list = window_list_provider_->GetWindowList();
   if (active) {
     FOR_EACH_OBSERVER(WindowManagerObserver, observers_, OnOverviewModeEnter());
 
     // Re-stack all windows in the order defined by window_list_provider_.
-    aura::Window::Windows window_list = window_list_provider_->GetWindowList();
-    aura::Window::Windows::iterator it;
-    for (it = window_list.begin(); it != window_list.end(); ++it)
+    for (aura::Window::Windows::iterator it = window_list.begin();
+         it != window_list.end();
+         ++it) {
       container_->StackChildAtTop(*it);
+
+      if (wm::IsActiveWindow(*it))
+        wm::ActivateWindow(NULL);
+    }
     overview_ = WindowOverviewMode::Create(
         container_.get(), window_list_provider_.get(),
         split_view_controller_.get(), this);
   } else {
+    // Select the topmost window in |window_list| if no member of |window_list|
+    // is active upon exiting overview mode.
+    aura::client::ActivationClient* activation_client =
+        aura::client::GetActivationClient(container_->GetRootWindow());
+    aura::Window* active = activation_client->GetActiveWindow();
+    aura::Window::Windows::iterator it =
+        std::find(window_list.begin(), window_list.end(), active);
+    if (it == window_list.end())
+      OnSelectWindow(*window_list.rbegin());
+
     overview_.reset();
     FOR_EACH_OBSERVER(WindowManagerObserver, observers_, OnOverviewModeExit());
   }
 }
 
 void WindowManagerImpl::InstallAccelerators() {
   const AcceleratorData accelerator_data[] = {
       {TRIGGER_ON_PRESS, ui::VKEY_F6, ui::EF_NONE, CMD_TOGGLE_OVERVIEW,
        AF_NONE},
       {TRIGGER_ON_PRESS, ui::VKEY_F6, ui::EF_CONTROL_DOWN,
@@ skipping 193 matching lines @@
   DCHECK(!instance);
 }
 
 // static
 WindowManager* WindowManager::GetInstance() {
   DCHECK(instance);
   return instance;
 }
 
 }  // namespace athena