OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "views/focus/accelerator_handler.h" | 5 #include "views/focus/accelerator_handler.h" |
6 | 6 |
7 #include <bitset> | 7 #include <bitset> |
8 #include <gtk/gtk.h> | 8 #include <gtk/gtk.h> |
9 #include <X11/extensions/XInput2.h> | 9 #include <X11/extensions/XInput2.h> |
10 | 10 |
11 #include "ui/base/touch/touch_factory.h" | 11 #include "ui/base/touch/touch_factory.h" |
| 12 #include "ui/views/ime/input_method.h" |
12 #include "views/events/event.h" | 13 #include "views/events/event.h" |
13 #include "views/focus/focus_manager.h" | 14 #include "views/focus/focus_manager.h" |
14 #include "views/ime/input_method.h" | |
15 #include "views/view.h" | 15 #include "views/view.h" |
16 #include "views/widget/native_widget.h" | 16 #include "views/widget/native_widget.h" |
17 | 17 |
18 namespace views { | 18 namespace views { |
19 | 19 |
20 namespace { | 20 namespace { |
21 | 21 |
22 Widget* FindWidgetForGdkWindow(GdkWindow* gdk_window) { | 22 Widget* FindWidgetForGdkWindow(GdkWindow* gdk_window) { |
23 gpointer data = NULL; | 23 gpointer data = NULL; |
24 gdk_window_get_user_data(gdk_window, &data); | 24 gdk_window_get_user_data(gdk_window, &data); |
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
178 AcceleratorHandler::AcceleratorHandler() {} | 178 AcceleratorHandler::AcceleratorHandler() {} |
179 | 179 |
180 base::MessagePumpDispatcher::DispatchStatus | 180 base::MessagePumpDispatcher::DispatchStatus |
181 AcceleratorHandler::Dispatch(XEvent* xev) { | 181 AcceleratorHandler::Dispatch(XEvent* xev) { |
182 return DispatchXEvent(xev) ? | 182 return DispatchXEvent(xev) ? |
183 base::MessagePumpDispatcher::EVENT_PROCESSED : | 183 base::MessagePumpDispatcher::EVENT_PROCESSED : |
184 base::MessagePumpDispatcher::EVENT_IGNORED; | 184 base::MessagePumpDispatcher::EVENT_IGNORED; |
185 } | 185 } |
186 | 186 |
187 } // namespace views | 187 } // namespace views |
OLD | NEW |