Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(263)

Side by Side Diff: views/focus/accelerator_handler_touch.cc

Issue 8508055: Move views::Accelerator to ui in order to use it from aura code. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebase Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 "views/accelerator.h"
13 #include "views/events/event.h" 12 #include "views/events/event.h"
14 #include "views/focus/focus_manager.h" 13 #include "views/focus/focus_manager.h"
15 #include "views/ime/input_method.h" 14 #include "views/ime/input_method.h"
16 #include "views/view.h" 15 #include "views/view.h"
17 #include "views/widget/native_widget.h" 16 #include "views/widget/native_widget.h"
18 17
19 namespace views { 18 namespace views {
20 19
21 namespace { 20 namespace {
22 21
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 AcceleratorHandler::AcceleratorHandler() {} 178 AcceleratorHandler::AcceleratorHandler() {}
180 179
181 base::MessagePumpDispatcher::DispatchStatus 180 base::MessagePumpDispatcher::DispatchStatus
182 AcceleratorHandler::Dispatch(XEvent* xev) { 181 AcceleratorHandler::Dispatch(XEvent* xev) {
183 return DispatchXEvent(xev) ? 182 return DispatchXEvent(xev) ?
184 base::MessagePumpDispatcher::EVENT_PROCESSED : 183 base::MessagePumpDispatcher::EVENT_PROCESSED :
185 base::MessagePumpDispatcher::EVENT_IGNORED; 184 base::MessagePumpDispatcher::EVENT_IGNORED;
186 } 185 }
187 186
188 } // namespace views 187 } // namespace views
OLDNEW
« no previous file with comments | « views/focus/accelerator_handler_gtk_unittest.cc ('k') | views/focus/accelerator_handler_wayland.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698