Refactor SetInOverview

athena/wm/window_manager_impl.h

Index: athena/wm/window_manager_impl.h
diff --git a/athena/wm/window_manager_impl.h b/athena/wm/window_manager_impl.h
index 2edd856d230cf0d475f32d75286af3db0c8c175c..05f881191a2f005a19369c97efed6fe5b6fd8f94 100644
--- a/athena/wm/window_manager_impl.h
+++ b/athena/wm/window_manager_impl.h
@@ -42,7 +42,9 @@ class ATHENA_EXPORT WindowManagerImpl : public WindowManager,
   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:
@@ -54,8 +56,9 @@ class ATHENA_EXPORT WindowManagerImpl : public WindowManager,
     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();