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

Side by Side Diff: ash/sticky_keys/sticky_keys_controller.cc

Issue 174803002: Move root_window.* to window_event_dispatcher.* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 10 months 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 | Annotate | Revision Log
« no previous file with comments | « ash/shell_unittest.cc ('k') | ash/sticky_keys/sticky_keys_overlay_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/sticky_keys/sticky_keys_controller.h" 5 #include "ash/sticky_keys/sticky_keys_controller.h"
6 6
7 #if defined(USE_X11) 7 #if defined(USE_X11)
8 #include <X11/extensions/XInput2.h> 8 #include <X11/extensions/XInput2.h>
9 #include <X11/Xlib.h> 9 #include <X11/Xlib.h>
10 #undef RootWindow 10 #undef RootWindow
11 #endif 11 #endif
12 12
13 #include "ash/sticky_keys/sticky_keys_overlay.h" 13 #include "ash/sticky_keys/sticky_keys_overlay.h"
14 #include "base/basictypes.h" 14 #include "base/basictypes.h"
15 #include "base/debug/stack_trace.h" 15 #include "base/debug/stack_trace.h"
16 #include "ui/aura/root_window.h"
17 #include "ui/aura/window.h" 16 #include "ui/aura/window.h"
17 #include "ui/aura/window_event_dispatcher.h"
18 #include "ui/aura/window_tracker.h" 18 #include "ui/aura/window_tracker.h"
19 #include "ui/events/event.h" 19 #include "ui/events/event.h"
20 #include "ui/events/keycodes/keyboard_code_conversion.h" 20 #include "ui/events/keycodes/keyboard_code_conversion.h"
21 21
22 namespace ash { 22 namespace ash {
23 23
24 namespace { 24 namespace {
25 25
26 // Returns true if the type of mouse event should be modified by sticky keys. 26 // Returns true if the type of mouse event should be modified by sticky keys.
27 bool ShouldModifyMouseEvent(ui::MouseEvent* event) { 27 bool ShouldModifyMouseEvent(ui::MouseEvent* event) {
(...skipping 446 matching lines...) Expand 10 before | Expand all | Expand 10 after
474 &xievent->mods.effective)); 474 &xievent->mods.effective));
475 } 475 }
476 } 476 }
477 #elif defined(USE_OZONE) 477 #elif defined(USE_OZONE)
478 NOTIMPLEMENTED() << "Modifier key is not handled"; 478 NOTIMPLEMENTED() << "Modifier key is not handled";
479 #endif 479 #endif
480 event->set_flags(event->flags() | modifier_flag_); 480 event->set_flags(event->flags() | modifier_flag_);
481 } 481 }
482 482
483 } // namespace ash 483 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shell_unittest.cc ('k') | ash/sticky_keys/sticky_keys_overlay_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698