Revert 285393 "Exit overview mode when a new activity is opened ..."

trunk/src/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/public/window_manager.h"
 
 #include "athena/common/container_priorities.h"
 #include "athena/input/public/accelerator_manager.h"
 #include "athena/screen/public/screen_manager.h"
 #include "athena/wm/bezel_controller.h"
@@ skipping 21 matching lines @@
   void Layout();
 
   // WindowManager:
   virtual void ToggleOverview() OVERRIDE;
 
  private:
   enum Command {
     COMMAND_TOGGLE_OVERVIEW,
   };
 
-  // Sets whether overview mode is active.
-  void SetInOverview(bool active);
-
   void InstallAccelerators();
 
   // WindowManager:
   virtual void AddObserver(WindowManagerObserver* observer) OVERRIDE;
   virtual void RemoveObserver(WindowManagerObserver* observer) OVERRIDE;
 
   // WindowOverviewModeDelegate:
   virtual void OnSelectWindow(aura::Window* window) OVERRIDE;
 
   // aura::WindowObserver
@@ skipping 53 matching lines @@
     container_->RemoveObserver(this);
     container_->RemovePreTargetHandler(bezel_controller_.get());
   }
   container_.reset();
   instance = NULL;
 }
 
 void WindowManagerImpl::Layout() {
   if (!container_)
     return;
-  SetInOverview(false);
   gfx::Rect bounds = gfx::Rect(container_->bounds().size());
   const aura::Window::Windows& children = container_->children();
   for (aura::Window::Windows::const_iterator iter = children.begin();
        iter != children.end();
        ++iter) {
     if ((*iter)->type() == ui::wm::WINDOW_TYPE_NORMAL ||
         (*iter)->type() == ui::wm::WINDOW_TYPE_POPUP)
       (*iter)->SetBounds(bounds);
   }
 }
 
 void WindowManagerImpl::ToggleOverview() {
-  SetInOverview(overview_.get() == NULL);
-}
-
-void WindowManagerImpl::SetInOverview(bool active) {
-  bool in_overview = !!overview_;
-  if (active == in_overview)
-    return;
-
-  if (active) {
+  if (overview_) {
+    overview_.reset();
+    FOR_EACH_OBSERVER(WindowManagerObserver, observers_,
+                      OnOverviewModeExit());
+  } else {
     overview_ = WindowOverviewMode::Create(container_.get(), this);
     FOR_EACH_OBSERVER(WindowManagerObserver, observers_,
                       OnOverviewModeEnter());
-  } else {
-    overview_.reset();
-    FOR_EACH_OBSERVER(WindowManagerObserver, observers_,
-                      OnOverviewModeExit());
   }
 }
 
 void WindowManagerImpl::InstallAccelerators() {
   const AcceleratorData accelerator_data[] = {
       {TRIGGER_ON_PRESS, ui::VKEY_F6, ui::EF_NONE, COMMAND_TOGGLE_OVERVIEW,
        AF_NONE},
   };
   AcceleratorManager::Get()->RegisterAccelerators(
       accelerator_data, arraysize(accelerator_data), this);
 }
 
 void WindowManagerImpl::AddObserver(WindowManagerObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 void WindowManagerImpl::RemoveObserver(WindowManagerObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
 void WindowManagerImpl::OnSelectWindow(aura::Window* window) {
   CHECK_EQ(container_.get(), window->parent());
   container_->StackChildAtTop(window);
   wm::ActivateWindow(window);
-  SetInOverview(false);
+  overview_.reset();
+  FOR_EACH_OBSERVER(WindowManagerObserver, observers_,
+                    OnOverviewModeExit());
 }
 
 void WindowManagerImpl::OnWindowDestroying(aura::Window* window) {
   if (window == container_)
     container_.reset();
 }
 
 bool WindowManagerImpl::IsCommandEnabled(int command_id) const {
   return true;
 }
@@ skipping 61 matching lines @@
   DCHECK(!instance);
 }
 
 // static
 WindowManager* WindowManager::GetInstance() {
   DCHECK(instance);
   return instance;
 }
 
 }  // namespace athena