Implements accelerator handling for menus on aura.

BUG=105964
TEST=Manual

Review URL: https://chromiumcodereview.appspot.com/9224001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120587 0039d316-1c4b-4281-b951-d872f2087c98

9 files changed, 209 insertions, 0 deletions

diff --git a/ash/accelerators/accelerator_dispatcher.cc b/ash/accelerators/accelerator_dispatcher.cc
new file mode 100644
index 0000000..46d7bec
--- /dev/null
+++ b/ash/accelerators/accelerator_dispatcher.cc
@@ -0,0 +1,15 @@
+// Copyright (c) 2012 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 "ash/accelerators/accelerator_dispatcher.h"
+
+namespace ash {
+
+AcceleratorDispatcher::AcceleratorDispatcher(
+    MessageLoop::Dispatcher* nested_dispatcher)
+    : nested_dispatcher_(nested_dispatcher) {
+  DCHECK(nested_dispatcher_);
+}
+
+}  // namespace ash
diff --git a/ash/accelerators/accelerator_dispatcher.h b/ash/accelerators/accelerator_dispatcher.h
new file mode 100644
index 0000000..9de596c
--- /dev/null
+++ b/ash/accelerators/accelerator_dispatcher.h
@@ -0,0 +1,37 @@
+// Copyright (c) 2012 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 ASH_ACCELERATORS_ACCELERATOR_DISPATCHER_H_
+#define ASH_ACCELERATORS_ACCELERATOR_DISPATCHER_H_
+#pragma once
+
+#include "ash/ash_export.h"
+#include "base/message_loop.h"
+
+namespace ash {
+
+// Dispatcher for handling accelerators in ash.
+// Wraps a nested dispatcher to which control is passed if no accelerator key
+// has been pressed.
+// TODO(pkotwicz): Port AcceleratorDispatcher to mac.
+class ASH_EXPORT AcceleratorDispatcher : public MessageLoop::Dispatcher {
+ public:
+  explicit AcceleratorDispatcher(MessageLoop::Dispatcher* nested_dispatcher);
+
+#if defined(USE_X11)
+  virtual base::MessagePumpDispatcher::DispatchStatus Dispatch(
+      XEvent* xev) OVERRIDE;
+#elif defined(OS_WIN)
+  bool AcceleratorDispatcher::Dispatch(const MSG& msg) OVERRIDE;
+#endif
+
+ private:
+  MessageLoop::Dispatcher* nested_dispatcher_;
+
+  DISALLOW_COPY_AND_ASSIGN(AcceleratorDispatcher);
+};
+
+}  // namespace ash
+
+#endif  // ASH_ACCELERATORS_ACCELERATOR_DISPATCHER_H_
diff --git a/ash/accelerators/accelerator_dispatcher_linux.cc b/ash/accelerators/accelerator_dispatcher_linux.cc
new file mode 100644
index 0000000..82b98aa
--- /dev/null
+++ b/ash/accelerators/accelerator_dispatcher_linux.cc
@@ -0,0 +1,46 @@
+// Copyright (c) 2012 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 "ash/accelerators/accelerator_dispatcher.h"
+
+#include <X11/Xlib.h>
+
+// Xlib defines RootWindow
+#ifdef RootWindow
+#undef RootWindow
+#endif
+
+#include "ash/accelerators/accelerator_controller.h"
+#include "ash/shell.h"
+#include "ui/aura/event.h"
+#include "ui/aura/root_window.h"
+#include "ui/base/accelerators/accelerator.h"
+
+namespace ash {
+
+namespace {
+
+const int kModifierMask = (ui::EF_SHIFT_DOWN |
+                           ui::EF_CONTROL_DOWN |
+                           ui::EF_ALT_DOWN);
+}  // namespace
+
+base::MessagePumpDispatcher::DispatchStatus AcceleratorDispatcher::Dispatch(
+    XEvent* xev) {
+  ash::Shell* shell = ash::Shell::GetInstance();
+  if (shell->IsScreenLocked())
+    return aura::RootWindow::GetInstance()->GetDispatcher()->Dispatch(xev);
+
+  if (xev->type == KeyPress) {
+    ash::AcceleratorController* accelerator_controller =
+        shell->accelerator_controller();
+    ui::Accelerator accelerator(ui::KeyboardCodeFromNative(xev),
+                                ui::EventFlagsFromNative(xev) & kModifierMask);
+    if (accelerator_controller && accelerator_controller->Process(accelerator))
+      return EVENT_PROCESSED;
+  }
+  return nested_dispatcher_->Dispatch(xev);
+}
+
+}  // namespace ash
diff --git a/ash/accelerators/accelerator_dispatcher_win.cc b/ash/accelerators/accelerator_dispatcher_win.cc
new file mode 100644
index 0000000..4682275
--- /dev/null
+++ b/ash/accelerators/accelerator_dispatcher_win.cc
@@ -0,0 +1,39 @@
+// Copyright (c) 2012 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 "ash/accelerators/accelerator_dispatcher.h"
+
+#include "ash/accelerators/accelerator_controller.h"
+#include "ash/shell.h"
+#include "ui/aura/event.h"
+#include "ui/aura/root_window.h"
+#include "ui/base/accelerators/accelerator.h"
+
+namespace ash {
+
+namespace {
+
+const int kModifierMask = (ui::EF_SHIFT_DOWN |
+                           ui::EF_CONTROL_DOWN |
+                           ui::EF_ALT_DOWN);
+}  // namespace
+
+bool AcceleratorDispatcher::Dispatch(const MSG& msg) {
+  ash::Shell* shell = ash::Shell::GetInstance();
+  if (shell->IsScreenLocked())
+    return aura::RootWindow::GetInstance()->GetDispatcher()->Dispatch(msg);
+
+  if(msg.message == WM_KEYDOWN || msg.message == WM_SYSKEYDOWN) {
+    ash::AcceleratorController* accelerator_controller =
+        shell->accelerator_controller();
+    ui::Accelerator accelerator(ui::KeyboardCodeFromNative(msg),
+        ui::EventFlagsFromNative(msg) & kModifierMask);
+    if (accelerator_controller && accelerator_controller->Process(accelerator))
+      return true;
+  }
+
+  return nested_dispatcher_->Dispatch(msg);
+}
+
+}  // namespace ash
diff --git a/ash/accelerators/nested_dispatcher_controller.cc b/ash/accelerators/nested_dispatcher_controller.cc
new file mode 100644
index 0000000..747a2ce
--- /dev/null
+++ b/ash/accelerators/nested_dispatcher_controller.cc
@@ -0,0 +1,28 @@
+// Copyright (c) 2012 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 "ash/accelerators/nested_dispatcher_controller.h"
+
+#include "ash/accelerators/accelerator_dispatcher.h"
+
+namespace ash {
+
+NestedDispatcherController::NestedDispatcherController() {
+  aura::client::SetDispatcherClient(this);
+}
+
+void NestedDispatcherController::RunWithDispatcher(
+    MessageLoop::Dispatcher* nested_dispatcher,
+    bool nestable_tasks_allowed) {
+  MessageLoopForUI* loop = MessageLoopForUI::current();
+  bool did_allow_task_nesting = loop->NestableTasksAllowed();
+  loop->SetNestableTasksAllowed(nestable_tasks_allowed);
+
+  AcceleratorDispatcher dispatcher(nested_dispatcher);
+
+  loop->RunWithDispatcher(&dispatcher);
+  loop->SetNestableTasksAllowed(did_allow_task_nesting);
+}
+
+}  // namespace ash
diff --git a/ash/accelerators/nested_dispatcher_controller.h b/ash/accelerators/nested_dispatcher_controller.h
new file mode 100644
index 0000000..31822af
--- /dev/null
+++ b/ash/accelerators/nested_dispatcher_controller.h
@@ -0,0 +1,33 @@
+// Copyright (c) 2012 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 ASH_ACCELERATORS_NESTED_DISPATCHER_CONTROLLER_H_
+#define ASH_ACCELERATORS_NESTED_DISPATCHER_CONTROLLER_H_
+#pragma once
+
+#include "ash/ash_export.h"
+#include "base/message_loop.h"
+#include "ui/aura/client/dispatcher_client.h"
+
+namespace ash {
+
+// Creates a dispatcher which wraps another dispatcher.
+// The outer dispatcher runs first and performs ash specific handling.
+// If it does not consume the event it forwards the event to the nested
+// dispatcher.
+class ASH_EXPORT NestedDispatcherController
+    : public aura::client::DispatcherClient {
+ public:
+  NestedDispatcherController();
+
+  virtual void RunWithDispatcher(MessageLoop::Dispatcher* dispatcher,
+                                 bool nestable_tasks_allowed) OVERRIDE;
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(NestedDispatcherController);
+};
+
+}  // namespace ash
+
+#endif  // ASH_ACCELERATORS_NESTED_DISPATCHER_CONTROLLER_H_
diff --git a/ash/ash.gyp b/ash/ash.gyp
index 3f00fff..720377d 100644
--- a/ash/ash.gyp
+++ b/ash/ash.gyp
@@ -36,8 +36,14 @@
         # All .cc, .h under ash, except unittests
         'accelerators/accelerator_controller.cc',
         'accelerators/accelerator_controller.h',
+	'accelerators/accelerator_dispatcher.cc',
+	'accelerators/accelerator_dispatcher.h',
+	'accelerators/accelerator_dispatcher_linux.cc',
+	'accelerators/accelerator_dispatcher_win.cc',
         'accelerators/accelerator_filter.cc',
         'accelerators/accelerator_filter.h',
+	'accelerators/nested_dispatcher_controller.cc',
+	'accelerators/nested_dispatcher_controller.h',
         'app_list/app_list.cc',
         'app_list/app_list.h',
         'app_list/app_list_groups_view.cc',
diff --git a/ash/shell.cc b/ash/shell.cc
index b1203bc..6f506bf 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -8,6 +8,7 @@
 
 #include "ash/accelerators/accelerator_controller.h"
 #include "ash/accelerators/accelerator_filter.h"
+#include "ash/accelerators/nested_dispatcher_controller.h"
 #include "ash/app_list/app_list.h"
 #include "ash/ash_switches.h"
 #include "ash/drag_drop/drag_drop_controller.h"
@@ -187,6 +188,7 @@ Shell* Shell::instance_ = NULL;
 
 Shell::Shell(ShellDelegate* delegate)
     : ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)),
+      nested_dispatcher_controller_(new NestedDispatcherController),
       accelerator_controller_(new AcceleratorController),
       delegate_(delegate),
       window_mode_(MODE_OVERLAPPING),
diff --git a/ash/shell.h b/ash/shell.h
index 16add64..9f20fc4 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -37,6 +37,7 @@ namespace ash {
 
 class AcceleratorController;
 class Launcher;
+class NestedDispatcherController;
 class PowerButtonController;
 class ShellDelegate;
 class VideoDetector;
@@ -171,6 +172,8 @@ class ASH_EXPORT Shell {
 
   base::WeakPtrFactory<Shell> method_factory_;
 
+  scoped_ptr<NestedDispatcherController> nested_dispatcher_controller_;
+
   scoped_ptr<AcceleratorController> accelerator_controller_;
 
   scoped_ptr<ShellDelegate> delegate_;