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

Side by Side Diff: ash/sticky_keys/sticky_keys_unittest.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
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 #include <X11/Xlib.h> 7 #include <X11/Xlib.h>
8 #undef None 8 #undef None
9 #undef Bool 9 #undef Bool
10 #undef RootWindow 10 #undef RootWindow
11 11
12 #include "ash/shell.h" 12 #include "ash/shell.h"
13 #include "ash/test/ash_test_base.h" 13 #include "ash/test/ash_test_base.h"
14 #include "base/bind.h" 14 #include "base/bind.h"
15 #include "base/callback.h" 15 #include "base/callback.h"
16 #include "base/memory/scoped_vector.h" 16 #include "base/memory/scoped_vector.h"
17 #include "ui/aura/root_window.h"
18 #include "ui/aura/window.h" 17 #include "ui/aura/window.h"
18 #include "ui/aura/window_event_dispatcher.h"
19 #include "ui/aura/window_tree_host_delegate.h" 19 #include "ui/aura/window_tree_host_delegate.h"
20 #include "ui/events/event_handler.h" 20 #include "ui/events/event_handler.h"
21 #include "ui/events/test/events_test_utils_x11.h" 21 #include "ui/events/test/events_test_utils_x11.h"
22 #include "ui/events/x/device_data_manager.h" 22 #include "ui/events/x/device_data_manager.h"
23 23
24 namespace ash { 24 namespace ash {
25 25
26 namespace { 26 namespace {
27 27
28 // The device id of the test scroll device. 28 // The device id of the test scroll device.
(...skipping 881 matching lines...) Expand 10 before | Expand all | Expand 10 after
910 static_cast<ui::MouseWheelEvent*>(events[0])->y_offset()); 910 static_cast<ui::MouseWheelEvent*>(events[0])->y_offset());
911 EXPECT_TRUE(events[0]->flags() & ui::EF_CONTROL_DOWN); 911 EXPECT_TRUE(events[0]->flags() & ui::EF_CONTROL_DOWN);
912 EXPECT_EQ(ui::ET_KEY_RELEASED, events[1]->type()); 912 EXPECT_EQ(ui::ET_KEY_RELEASED, events[1]->type());
913 EXPECT_EQ(ui::VKEY_CONTROL, 913 EXPECT_EQ(ui::VKEY_CONTROL,
914 static_cast<ui::KeyEvent*>(events[1])->key_code()); 914 static_cast<ui::KeyEvent*>(events[1])->key_code());
915 915
916 Shell::GetInstance()->RemovePreTargetHandler(&buffer); 916 Shell::GetInstance()->RemovePreTargetHandler(&buffer);
917 } 917 }
918 918
919 } // namespace ash 919 } // namespace ash
OLDNEW
« no previous file with comments | « ash/sticky_keys/sticky_keys_overlay_unittest.cc ('k') | ash/system/logout_button/logout_confirmation_dialog_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698