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 4895555dc974a60ae132dbbf135fdf8204c7a550..89aac9f698a579accd14a1850c4ed85ba94d9bde 100644
--- a/athena/wm/window_manager_impl.h
+++ b/athena/wm/window_manager_impl.h
@@ -66,11 +66,11 @@ class WindowManagerImpl : public WindowManager,
 
   // WindowOverviewModeDelegate:
   virtual void OnSelectWindow(aura::Window* window) OVERRIDE;
-  virtual void OnSplitViewMode(aura::Window* left,
-                               aura::Window* right) OVERRIDE;
+  virtual void OnSelectSplitViewWindow(aura::Window* left,
+                                       aura::Window* right,
+                                       aura::Window* to_activate) OVERRIDE;
 
   // aura::WindowObserver:
-  virtual void OnWindowAdded(aura::Window* new_window) OVERRIDE;
   virtual void OnWindowDestroying(aura::Window* window) OVERRIDE;
 
   // AcceleratorHandler:
@@ -94,6 +94,10 @@ class WindowManagerImpl : public WindowManager,
   scoped_ptr<wm::ShadowController> shadow_controller_;
   ObserverList<WindowManagerObserver> observers_;
 
+  // Whether a window is in the process of being selected in overview mode via
+  // OnSelectWindow() or OnSelectSplitViewWindow();
+  bool selecting_window_;
+
   DISALLOW_COPY_AND_ASSIGN(WindowManagerImpl);
 };