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

Side by Side Diff: ash/touch/touch_transformer_controller_unittest.cc

Issue 685793002: Move all event related devices from ui/events/ to ui/events/devices/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@internal-touchscreens
Patch Set: Fixed ash include Created 6 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/touch/touch_transformer_controller.h" 5 #include "ash/touch/touch_transformer_controller.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/test/ash_test_base.h" 8 #include "ash/test/ash_test_base.h"
9 #include "ui/aura/window_tree_host.h" 9 #include "ui/aura/window_tree_host.h"
10 #include "ui/events/device_data_manager.h" 10 #include "ui/events/devices/device_data_manager.h"
11 #include "ui/events/test/events_test_utils_x11.h" 11 #include "ui/events/test/events_test_utils_x11.h"
12 #include "ui/gfx/display.h" 12 #include "ui/gfx/display.h"
13 13
14 namespace ash { 14 namespace ash {
15 15
16 namespace { 16 namespace {
17 DisplayInfo CreateDisplayInfo(int64 id, 17 DisplayInfo CreateDisplayInfo(int64 id,
18 unsigned int touch_device_id, 18 unsigned int touch_device_id,
19 const gfx::Rect& bounds) { 19 const gfx::Rect& bounds) {
20 DisplayInfo info(id, std::string(), false); 20 DisplayInfo info(id, std::string(), false);
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after
213 gfx::Size(1001, 1001)); 213 gfx::Size(1001, 1001));
214 214
215 TouchTransformerController* tt_controller = 215 TouchTransformerController* tt_controller =
216 Shell::GetInstance()->touch_transformer_controller(); 216 Shell::GetInstance()->touch_transformer_controller();
217 // Default touchscreen position range is 1001x1001; 217 // Default touchscreen position range is 1001x1001;
218 EXPECT_EQ(sqrt((2560.0 * 1600.0) / (1001.0 * 1001.0)), 218 EXPECT_EQ(sqrt((2560.0 * 1600.0) / (1001.0 * 1001.0)),
219 tt_controller->GetTouchResolutionScale(display, touch_device)); 219 tt_controller->GetTouchResolutionScale(display, touch_device));
220 } 220 }
221 221
222 } // namespace ash 222 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698