Ensure that an activity is activated when overview mode is exited

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 d741585ad7095cd268f5f12fb3aa4bc9d9f3da5d..745f74a470715b1b19fd386e02e71a78e9cfa172 100644
--- a/athena/wm/window_manager_impl.h
+++ b/athena/wm/window_manager_impl.h
@@ -51,8 +51,17 @@ class WindowManagerImpl : public WindowManager,
     CMD_TOGGLE_SPLIT_VIEW,
   };
 
-  // Sets whether overview mode is active.
-  void SetInOverview(bool active);
+  // Enters overview mode.
+  void EnterOverview();
+
+  // Exits overview mode and activates |window|. |split_type| indicates whether
+  // the window should be part of split view and what position it should have in
+  // split view.
+  void ExitOverview(aura::Window* window, SplitType split_type);
+
+  // Exits overview mode. The window which is activated and whether split view
+  // is entered or exited is determinbed based on overview mode's current state.
+  void ExitOverview();
 
   void ToggleSplitview();
 
@@ -64,12 +73,10 @@ class WindowManagerImpl : public WindowManager,
   virtual void ToggleSplitViewForTest() OVERRIDE;
 
   // WindowOverviewModeDelegate:
-  virtual void OnSelectWindow(aura::Window* window) OVERRIDE;
-  virtual void OnSplitViewMode(aura::Window* left,
-                               aura::Window* right) OVERRIDE;
+  virtual void OnSelectWindow(aura::Window* window,
+                              SplitType split_type) OVERRIDE;
 
   // aura::WindowObserver:
-  virtual void OnWindowAdded(aura::Window* new_window) OVERRIDE;
   virtual void OnWindowDestroying(aura::Window* window) OVERRIDE;
 
   // AcceleratorHandler: