| 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 |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 83 return true; | 83 return true; |
| 84 accelerator.set_type(aura::TranslatedKeyEvent(event, false).type()); | 84 accelerator.set_type(aura::TranslatedKeyEvent(event, false).type()); |
| 85 if (accelerator_controller->Process(accelerator)) | 85 if (accelerator_controller->Process(accelerator)) |
| 86 return true; | 86 return true; |
| 87 } | 87 } |
| 88 } | 88 } |
| 89 | 89 |
| 90 return nested_dispatcher_->Dispatch(event); | 90 return nested_dispatcher_->Dispatch(event); |
| 91 } | 91 } |
| 92 | 92 |
| 93 bool AcceleratorDispatcher::ShouldExit() { |
| 94 return nested_dispatcher_->ShouldExit(); |
| 95 } |
| 96 |
| 93 } // namespace ash | 97 } // namespace ash |
| OLD | NEW |