ESC accelerator and consistent overview mode for Athena homecard

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..a4919e0b3782316aa47391abb449d45949cf96f5 100644
--- a/athena/wm/window_manager_impl.h
+++ b/athena/wm/window_manager_impl.h
@@ -42,14 +42,15 @@ class ATHENA_EXPORT WindowManagerImpl : public WindowManager,
   void ToggleSplitView();
 
   // WindowManager:
-  virtual void ToggleOverview() override;
-  virtual bool IsOverviewModeActive() override;
+  virtual void ActivateOverview(bool activate) OVERRIDE;

[Jun Mukai, 2014/10/06 21:23:49]

Please keep the lowercase override.  That's the new C++11 style (FYI:
http://chromium-cpp.appspot.com/)

[Greg Levin, 2014/10/08 18:21:14]

Done (!&@#$ merge tool)

+  virtual bool IsOverviewModeActive() OVERRIDE;
 
  private:
   friend class test::WindowManagerImplTestApi;
   friend class AthenaContainerLayoutManager;
 
   enum Command {
+    CMD_EXIT_OVERVIEW,
     CMD_TOGGLE_OVERVIEW,
     CMD_TOGGLE_SPLIT_VIEW,
   };
@@ -60,30 +61,30 @@ class ATHENA_EXPORT WindowManagerImpl : public WindowManager,
   void InstallAccelerators();
 
   // WindowManager:
-  virtual void AddObserver(WindowManagerObserver* observer) override;
-  virtual void RemoveObserver(WindowManagerObserver* observer) override;
-  virtual void ToggleSplitViewForTest() override;
-  virtual WindowListProvider* GetWindowListProvider() override;
+  virtual void AddObserver(WindowManagerObserver* observer) OVERRIDE;
+  virtual void RemoveObserver(WindowManagerObserver* observer) OVERRIDE;
+  virtual void ToggleSplitViewForTest() OVERRIDE;
+  virtual WindowListProvider* GetWindowListProvider() OVERRIDE;
 
   // WindowOverviewModeDelegate:
-  virtual void OnSelectWindow(aura::Window* window) override;
+  virtual void OnSelectWindow(aura::Window* window) OVERRIDE;
   virtual void OnSelectSplitViewWindow(aura::Window* left,
                                        aura::Window* right,
-                                       aura::Window* to_activate) override;
+                                       aura::Window* to_activate) OVERRIDE;
 
   // aura::WindowObserver:
-  virtual void OnWindowDestroying(aura::Window* window) override;
+  virtual void OnWindowDestroying(aura::Window* window) OVERRIDE;
 
   // AcceleratorHandler:
-  virtual bool IsCommandEnabled(int command_id) const override;
+  virtual bool IsCommandEnabled(int command_id) const OVERRIDE;
   virtual bool OnAcceleratorFired(int command_id,
-                                  const ui::Accelerator& accelerator) override;
+                                  const ui::Accelerator& accelerator) OVERRIDE;
 
   // TitleDragControllerDelegate:
-  virtual aura::Window* GetWindowBehind(aura::Window* window) override;
-  virtual void OnTitleDragStarted(aura::Window* window) override;
-  virtual void OnTitleDragCompleted(aura::Window* window) override;
-  virtual void OnTitleDragCanceled(aura::Window* window) override;
+  virtual aura::Window* GetWindowBehind(aura::Window* window) OVERRIDE;
+  virtual void OnTitleDragStarted(aura::Window* window) OVERRIDE;
+  virtual void OnTitleDragCompleted(aura::Window* window) OVERRIDE;
+  virtual void OnTitleDragCanceled(aura::Window* window) OVERRIDE;
 
   scoped_ptr<aura::Window> container_;
   scoped_ptr<WindowListProvider> window_list_provider_;