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

Side by Side Diff: ash/touch/touchscreen_util.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: fix ozone 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
« no previous file with comments | « ash/touch/touchscreen_util.h ('k') | ash/touch/touchscreen_util_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 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/touchscreen_util.h" 5 #include "ash/touch/touchscreen_util.h"
6 6
7 #include <set> 7 #include <set>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "ui/events/input_device.h" 10 #include "ui/events/devices/input_device.h"
11 11
12 namespace ash { 12 namespace ash {
13 13
14 void AssociateTouchscreens(std::vector<DisplayInfo>* displays, 14 void AssociateTouchscreens(std::vector<DisplayInfo>* displays,
15 const std::vector<ui::TouchscreenDevice>& devices) { 15 const std::vector<ui::TouchscreenDevice>& devices) {
16 std::set<int> no_match_touchscreen; 16 std::set<int> no_match_touchscreen;
17 int internal_touchscreen = -1; 17 int internal_touchscreen = -1;
18 for (size_t i = 0; i < devices.size(); ++i) { 18 for (size_t i = 0; i < devices.size(); ++i) {
19 if (devices[i].type == ui::InputDeviceType::INPUT_DEVICE_INTERNAL) { 19 if (devices[i].type == ui::InputDeviceType::INPUT_DEVICE_INTERNAL) {
20 internal_touchscreen = i; 20 internal_touchscreen = i;
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 state->set_touch_support(gfx::Display::TOUCH_SUPPORT_AVAILABLE); 95 state->set_touch_support(gfx::Display::TOUCH_SUPPORT_AVAILABLE);
96 VLOG(2) << "Arbitrarily matching touchscreen " 96 VLOG(2) << "Arbitrarily matching touchscreen "
97 << state->touch_device_id() << " to display " << state->id(); 97 << state->touch_device_id() << " to display " << state->id();
98 break; 98 break;
99 } 99 }
100 } 100 }
101 } 101 }
102 } 102 }
103 103
104 } // namespace ash 104 } // namespace ash
OLDNEW
« no previous file with comments | « ash/touch/touchscreen_util.h ('k') | ash/touch/touchscreen_util_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698