Ensure that an activity is activated when overview mode is exited

athena/wm/window_overview_mode.h

Index: athena/wm/window_overview_mode.h
diff --git a/athena/wm/window_overview_mode.h b/athena/wm/window_overview_mode.h
index 6597fea433d8c170164bc1fce6193579c6e83955..13ec9ce2891fcb6b683462f927a6edcccf8ec080 100644
--- a/athena/wm/window_overview_mode.h
+++ b/athena/wm/window_overview_mode.h
@@ -16,13 +16,17 @@ class WindowOverviewModeDelegate {
  public:
   virtual ~WindowOverviewModeDelegate() {}
 
+  // Called to activate |window|, set its bounds and set its visibility when
+  // |window| is selected in overview mode. |window| is NULL if there are no
+  // windows in overview mode.
   virtual void OnSelectWindow(aura::Window* window) = 0;
 
   // Gets into split-view mode with |left| on the left-side of the screen, and
   // |right| on the right-side. If |left| or |right| is NULL, then the delegate
   // selects the best option in its place.
-  virtual void OnSplitViewMode(aura::Window* left,
-                               aura::Window* right) = 0;
+  virtual void OnSelectSplitViewWindow(aura::Window* left,
+                                       aura::Window* right,
+                                       aura::Window* to_activate) = 0;
 };
 
 class WindowOverviewMode {
@@ -34,6 +38,10 @@ class WindowOverviewMode {
       const WindowListProvider* window_list_provider,
       SplitViewController* split_view_controller,
       WindowOverviewModeDelegate* delegate);
+
+  // Select a window based on overview's current state. No-op if there are no
+  // windows in overview.
+  virtual void SelectDefaultWindow() = 0;
 };
 
 }  // namespace athena