Ensure that an activity is activated when overview mode is exited

athena/wm/window_overview_mode.cc

Index: athena/wm/window_overview_mode.cc
diff --git a/athena/wm/window_overview_mode.cc b/athena/wm/window_overview_mode.cc
index 704223a380ebd6d7e6089a17149a0097947753c0..4905bdfb1a415d47ec62b9eab425b0b9be681ba2 100644
--- a/athena/wm/window_overview_mode.cc
+++ b/athena/wm/window_overview_mode.cc
@@ -592,7 +592,9 @@ class WindowOverviewModeImpl : public WindowOverviewMode,
     OverviewToolbar::ActionType action = overview_toolbar_->current_action();
     overview_toolbar_.reset();
     if (action == OverviewToolbar::ACTION_TYPE_SPLIT) {
-      delegate_->OnSplitViewMode(NULL, dragged_window_);
+      delegate_->OnSelectSplitViewWindow(NULL,
+                                         dragged_window_,
+                                         dragged_window_);
       return;
     }
 
@@ -606,7 +608,7 @@ class WindowOverviewModeImpl : public WindowOverviewMode,
         left = dragged_window_;
       else
         right = dragged_window_;
-      delegate_->OnSplitViewMode(left, right);
+      delegate_->OnSelectSplitViewWindow(left, right, dragged_window_);
       return;
     }
 
@@ -624,8 +626,10 @@ class WindowOverviewModeImpl : public WindowOverviewMode,
       // current state.
       if (window == split_view_controller_->left_window() ||
           window == split_view_controller_->right_window()) {
-        delegate_->OnSplitViewMode(split_view_controller_->left_window(),
-                                   split_view_controller_->right_window());
+        delegate_->OnSelectSplitViewWindow(
+            split_view_controller_->left_window(),
+            split_view_controller_->right_window(),
+            window);
       } else {
         delegate_->OnSelectWindow(window);
       }