| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ash/accelerators/accelerator_dispatcher.h" | 5 #include "ash/accelerators/accelerator_dispatcher.h" |
| 6 | 6 |
| 7 #if defined(USE_X11) | 7 #if defined(USE_X11) |
| 8 #include <X11/Xlib.h> | 8 #include <X11/Xlib.h> |
| 9 | 9 |
| 10 // Xlib defines RootWindow | 10 // Xlib defines RootWindow |
| 11 #ifdef RootWindow | 11 #ifdef RootWindow |
| 12 #undef RootWindow | 12 #undef RootWindow |
| 13 #endif | 13 #endif |
| 14 #endif // defined(USE_X11) | 14 #endif // defined(USE_X11) |
| 15 | 15 |
| 16 #include "ash/accelerators/accelerator_controller.h" | 16 #include "ash/accelerators/accelerator_controller.h" |
| 17 #include "ash/shell.h" | 17 #include "ash/shell.h" |
| 18 #include "ui/aura/env.h" | 18 #include "ui/aura/env.h" |
| 19 #include "ui/aura/root_window.h" | 19 #include "ui/aura/window_event_dispatcher.h" |
| 20 #include "ui/base/accelerators/accelerator.h" | 20 #include "ui/base/accelerators/accelerator.h" |
| 21 #include "ui/events/event.h" | 21 #include "ui/events/event.h" |
| 22 #include "ui/events/event_constants.h" | 22 #include "ui/events/event_constants.h" |
| 23 #include "ui/events/event_utils.h" | 23 #include "ui/events/event_utils.h" |
| 24 #include "ui/views/controls/menu/menu_controller.h" | 24 #include "ui/views/controls/menu/menu_controller.h" |
| 25 | 25 |
| 26 namespace ash { | 26 namespace ash { |
| 27 namespace { | 27 namespace { |
| 28 | 28 |
| 29 const int kModifierMask = (ui::EF_SHIFT_DOWN | | 29 const int kModifierMask = (ui::EF_SHIFT_DOWN | |
| (...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 121 return POST_DISPATCH_NONE; | 121 return POST_DISPATCH_NONE; |
| 122 } | 122 } |
| 123 | 123 |
| 124 return nested_dispatcher_->Dispatch(key_event.native_event()); | 124 return nested_dispatcher_->Dispatch(key_event.native_event()); |
| 125 } | 125 } |
| 126 | 126 |
| 127 return nested_dispatcher_->Dispatch(event); | 127 return nested_dispatcher_->Dispatch(event); |
| 128 } | 128 } |
| 129 | 129 |
| 130 } // namespace ash | 130 } // namespace ash |
| OLD | NEW |