| Index: ash/accelerators/accelerator_dispatcher_linux.cc
|
| diff --git a/ash/accelerators/accelerator_dispatcher_linux.cc b/ash/accelerators/accelerator_dispatcher_linux.cc
|
| new file mode 100644
|
| index 0000000000000000000000000000000000000000..82b98aa2745402dccc9906f988e439d4a5c09bb6
|
| --- /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
|
|
|