Use accelerator to switch overview mode

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/public/window_manager.h"
 
+#include "athena/input/public/accelerator_manager.h"
 #include "athena/screen/public/screen_manager.h"
 #include "athena/wm/window_overview_mode.h"
 #include "base/logging.h"
 #include "ui/aura/layout_manager.h"
 #include "ui/aura/window.h"
 #include "ui/wm/public/window_types.h"
 
 namespace athena {
 namespace {
 
 class WindowManagerImpl : public WindowManager,
                           public WindowOverviewModeDelegate,
-                          public aura::WindowObserver {
+                          public aura::WindowObserver,
+                          public AcceleratorHandler {
  public:
   WindowManagerImpl();
   virtual ~WindowManagerImpl();
 
+  void Init() {
+    InstallAccelerators();
+  }
+
   void Layout();
 
+

[sadrul, 2014/07/15 04:41:38]

remove this extra blank line.

[oshima, 2014/07/15 19:36:18]

Done.

   // WindowManager:
   virtual void ToggleOverview() OVERRIDE {
     if (overview_)
       overview_.reset();
     else
       overview_ = WindowOverviewMode::Create(container_.get(), this);
   }
 
  private:
+  enum Command {
+    COMMAND_TOGGLE_OVERVIEW,
+  };
+
+  void InstallAccelerators() {
+    const AcceleratorData accelerator_data[] = {
+      {TRIGGER_ON_PRESS, ui::VKEY_6, ui::EF_NONE,
+       COMMAND_TOGGLE_OVERVIEW, AF_NONE},
+    };
+    AcceleratorManager::Get()->RegisterAccelerators(
+        accelerator_data, arraysize(accelerator_data), this);
+  }
+
   // WindowOverviewModeDelegate:
   virtual void OnSelectWindow(aura::Window* window) OVERRIDE {
     CHECK_EQ(container_.get(), window->parent());
     container_->StackChildAtTop(window);
     overview_.reset();
   }
 
   // aura::WindowObserver
   virtual void OnWindowDestroying(aura::Window* window) OVERRIDE {
     if (window == container_)
       container_.reset();
   }
 
+  // AcceleratorHandler:
+  virtual bool IsCommandEnabled(int command_id) const OVERRIDE { return true; }
+  virtual bool OnAcceleratorFired(int command_id,
+                                  const ui::Accelerator& accelerator) OVERRIDE {
+    switch (command_id) {
+      case COMMAND_TOGGLE_OVERVIEW:
+        ToggleOverview();
+        break;
+    }
+    return true;
+  }
+
   scoped_ptr<aura::Window> container_;
   scoped_ptr<ui::EventHandler> temp_handler_;
   scoped_ptr<WindowOverviewMode> overview_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowManagerImpl);
 };
 
 class WindowManagerImpl* instance = NULL;
 
 class AthenaContainerLayoutManager : public aura::LayoutManager {
@@ skipping 17 matching lines @@
   }
   virtual void SetChildBounds(aura::Window* child,
                               const gfx::Rect& requested_bounds) OVERRIDE {
     if (!requested_bounds.IsEmpty())
       SetChildBoundsDirect(child, requested_bounds);
   }
 
   DISALLOW_COPY_AND_ASSIGN(AthenaContainerLayoutManager);
 };
 
 class TempEventHandler : public ui::EventHandler {

[sadrul, 2014/07/15 04:41:38]

This should no longer be necessary, right?

[oshima, 2014/07/15 19:36:18]

Thanks, removed.

  public:
   TempEventHandler() {}
   virtual ~TempEventHandler() {}
 
  private:
   // ui::EventHandler:
   virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE {
     if (event->type() == ui::ET_KEY_PRESSED &&
         event->key_code() == ui::VKEY_F6) {
       instance->ToggleOverview();
@@ skipping 46 matching lines @@
 }
 
 // static
 void WindowManager::Shutdown() {
   DCHECK(instance);
   delete instance;
   DCHECK(!instance);
 }
 
 }  // namespace athena