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

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

Issue 289283015: Extract touchscreen device management into a generic manager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Updated Created 6 years, 6 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/window.h" 17 #include "ui/aura/window.h"
18 #include "ui/aura/window_tree_host.h" 18 #include "ui/aura/window_tree_host.h"
19 #include "ui/events/event_handler.h" 19 #include "ui/events/event_handler.h"
20 #include "ui/events/event_processor.h" 20 #include "ui/events/event_processor.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"
23 22
24 namespace ash { 23 namespace ash {
25 24
26 namespace { 25 namespace {
27 26
28 // The device id of the test touchpad device. 27 // The device id of the test touchpad device.
29 const unsigned int kTouchPadDeviceId = 1; 28 const unsigned int kTouchPadDeviceId = 1;
30 29
31 } // namespace 30 } // namespace
32 31
(...skipping 965 matching lines...) Expand 10 before | Expand all | Expand 10 after
998 static_cast<ui::KeyEvent*>(events[1])->key_code()); 997 static_cast<ui::KeyEvent*>(events[1])->key_code());
999 998
1000 Shell::GetInstance()->RemovePreTargetHandler(&buffer); 999 Shell::GetInstance()->RemovePreTargetHandler(&buffer);
1001 } 1000 }
1002 1001
1003 INSTANTIATE_TEST_CASE_P(DPIScaleFactors, 1002 INSTANTIATE_TEST_CASE_P(DPIScaleFactors,
1004 StickyKeysMouseDispatchTest, 1003 StickyKeysMouseDispatchTest,
1005 ::testing::Values(1, 2)); 1004 ::testing::Values(1, 2));
1006 1005
1007 } // namespace ash 1006 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698