ESC accelerator and consistent overview mode for Athena homecard

athena/wm/window_manager_impl.cc

 // 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.
 
 #include "athena/wm/window_manager_impl.h"
 
 #include <algorithm>
 
 #include "athena/screen/public/screen_manager.h"
 #include "athena/util/container_priorities.h"
@@ skipping 195 matching lines @@
     return;
 
   bezel_controller_->set_left_right_delegate(NULL);
   FOR_EACH_OBSERVER(WindowManagerObserver, observers_, OnOverviewModeEnter());
 
   // Note: The window_list_provider_ resembles the exact window list of the
   // container, so no re-stacking is required before showing the OverviewMode.
   overview_ = WindowOverviewMode::Create(
       container_.get(), window_list_provider_.get(),
       split_view_controller_.get(), this);
+  AcceleratorManager::Get()->RegisterAccelerator(kEscAcceleratorData, this);
 }
 
 void WindowManagerImpl::ExitOverview() {
   if (!IsOverviewModeActive())
     return;
 
   ExitOverviewNoActivate();
 
   // Activate the window which was active prior to entering overview.
   const aura::Window::Windows windows = window_list_provider_->GetWindowList();
@@ skipping 11 matching lines @@
   return overview_;
 }
 
 void WindowManagerImpl::ExitOverviewNoActivate() {
   if (!IsOverviewModeActive())
     return;
 
   bezel_controller_->set_left_right_delegate(split_view_controller_.get());
   overview_.reset();
   FOR_EACH_OBSERVER(WindowManagerObserver, observers_, OnOverviewModeExit());
+  AcceleratorManager::Get()->UnregisterAccelerator(kEscAcceleratorData, this);
 }
 
 void WindowManagerImpl::InstallAccelerators() {
   const AcceleratorData accelerator_data[] = {
       {TRIGGER_ON_PRESS,
        ui::VKEY_F6,
        ui::EF_NONE,
        CMD_TOGGLE_OVERVIEW,
        AF_NONE},
       {TRIGGER_ON_PRESS,
@@ skipping 78 matching lines @@
     container_.reset();
 }
 
 bool WindowManagerImpl::IsCommandEnabled(int command_id) const {
   return true;
 }
 
 bool WindowManagerImpl::OnAcceleratorFired(int command_id,
                                            const ui::Accelerator& accelerator) {
   switch (command_id) {
+    case CMD_EXIT_OVERVIEW:
+      ExitOverview();
+      break;
     case CMD_TOGGLE_OVERVIEW:
       if (IsOverviewModeActive())
         ExitOverview();
       else
         EnterOverview();
       break;
     case CMD_TOGGLE_SPLIT_VIEW:
       ToggleSplitView();
       break;
   }
@@ skipping 93 matching lines @@
   DCHECK(!instance);
 }
 
 // static
 WindowManager* WindowManager::Get() {
   DCHECK(instance);
   return instance;
 }
 
 }  // namespace athena