Refactor SetInOverview

athena/wm/window_manager_impl.h

 // 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.
 
 #ifndef ATHENA_WM_WINDOW_MANAGER_IMPL_H_
 #define ATHENA_WM_WINDOW_MANAGER_IMPL_H_
 
 #include "athena/athena_export.h"
 #include "athena/input/public/accelerator_manager.h"
 #include "athena/wm/public/window_manager.h"
@@ skipping 24 matching lines @@
                                         public aura::WindowObserver,
                                         public AcceleratorHandler,
                                         public TitleDragControllerDelegate {
  public:
   WindowManagerImpl();
   virtual ~WindowManagerImpl();
 
   void ToggleSplitView();
 
   // WindowManager:
-  virtual void ToggleOverview() override;
+  virtual void EnterOverview() override;
+  // Exits overview and activates the previously active activity
+  virtual void ExitOverview() override;
   virtual bool IsOverviewModeActive() override;
 
  private:
   friend class test::WindowManagerImplTestApi;
   friend class AthenaContainerLayoutManager;
 
   enum Command {
     CMD_TOGGLE_OVERVIEW,
     CMD_TOGGLE_SPLIT_VIEW,
   };
 
-  // Sets whether overview mode is active.
-  void SetInOverview(bool active);
+  // Exits overview mode without changing activation.  The caller should
+  // ensure that a window is active after exiting overview mode.
+  void ExitOverviewNoActivate();
 
   void InstallAccelerators();
 
   // WindowManager:
   virtual void AddObserver(WindowManagerObserver* observer) override;
   virtual void RemoveObserver(WindowManagerObserver* observer) override;
   virtual void ToggleSplitViewForTest() override;
   virtual WindowListProvider* GetWindowListProvider() override;
 
   // WindowOverviewModeDelegate:
@@ skipping 25 matching lines @@
   scoped_ptr<TitleDragController> title_drag_controller_;
   scoped_ptr<wm::ShadowController> shadow_controller_;
   ObserverList<WindowManagerObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowManagerImpl);
 };
 
 }  // namespace athena
 
 #endif  // ATHENA_WM_WINDOW_MANAGER_IMPL_H_