ESC accelerator and consistent overview mode for Athena homecard

athena/wm/window_manager_impl.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef ATHENA_WM_WINDOW_MANAGER_IMPL_H_
 #define ATHENA_WM_WINDOW_MANAGER_IMPL_H_
 
 #include "athena/athena_export.h"
 #include "athena/input/public/accelerator_manager.h"
 #include "athena/wm/public/window_manager.h"
@@ skipping 34 matching lines @@
   virtual void EnterOverview() override;
   // Exits overview and activates the previously active activity
   virtual void ExitOverview() override;
   virtual bool IsOverviewModeActive() override;
 
  private:
   friend class test::WindowManagerImplTestApi;
   friend class AthenaContainerLayoutManager;
 
   enum Command {
+    CMD_EXIT_OVERVIEW,
     CMD_TOGGLE_OVERVIEW,
     CMD_TOGGLE_SPLIT_VIEW,
   };
 
+  const AcceleratorData kEscAcceleratorData = {TRIGGER_ON_PRESS,
+                                               ui::VKEY_ESCAPE,
+                                               ui::EF_NONE,
+                                               CMD_EXIT_OVERVIEW,
+                                               AF_NONE};
+
   // Exits overview mode without changing activation.  The caller should
   // ensure that a window is active after exiting overview mode.
   void ExitOverviewNoActivate();
 
   void InstallAccelerators();
 
   // WindowManager:
   virtual void AddObserver(WindowManagerObserver* observer) override;
   virtual void RemoveObserver(WindowManagerObserver* observer) override;
   virtual void ToggleSplitViewForTest() override;
@@ skipping 28 matching lines @@
   scoped_ptr<TitleDragController> title_drag_controller_;
   scoped_ptr<wm::ShadowController> shadow_controller_;
   ObserverList<WindowManagerObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowManagerImpl);
 };
 
 }  // namespace athena
 
 #endif  // ATHENA_WM_WINDOW_MANAGER_IMPL_H_