Fixes issue with accelerators when a menu is open

ash/accelerators/accelerator_handler_linux.cc

+// 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 <X11/Xlib.h>

[oshima, 2012/01/23 21:40:52]

move this after accelerator_handler.h but before accelerator_controller.h. Sorry
if it wasn't clear.

+
+#include "ash/accelerators/accelerator_handler.h"
+
+#include "ash/accelerators/accelerator_controller.h"
+#include "ash/shell.h"
+#include "base/message_loop.h"
+#include "base/message_pump_x.h"
+#include "ui/aura/event.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

[oshima, 2012/01/23 21:40:52]

two spaces before //

+
+base::MessagePumpDispatcher::DispatchStatus AcceleratorHandler::Dispatch(
+    XEvent* xev) {
+  if (xev->type == KeyPress) {
+    ash::AcceleratorController* accelerator_controller =
+        ash::Shell::GetInstance()->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

[oshima, 2012/01/23 21:40:52]

ditto