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

Side by Side Diff: ui/base/touch/touch_device_linux.cc

Issue 815983003: Unified touch_device_aurax11 and touch_device_ozone. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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
« no previous file with comments | « ui/base/touch/touch_device_aurax11.cc ('k') | ui/base/touch/touch_device_ozone.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 (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 "ui/base/touch/touch_device.h" 5 #include "ui/base/touch/touch_device.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "ui/events/devices/device_data_manager.h" 8 #include "ui/events/devices/device_data_manager.h"
9 9
10 namespace ui { 10 namespace ui {
11 11
12 bool IsTouchDevicePresent() { 12 bool IsTouchDevicePresent() {
13 return ui::DeviceDataManager::GetInstance()->touchscreen_devices().size() > 0; 13 return ui::DeviceDataManager::GetInstance()->touchscreen_devices().size() > 0;
14 } 14 }
15 15
16 int MaxTouchPoints() { 16 int MaxTouchPoints() {
17 int max_touch = -1; 17 int max_touch = 0;
18 const std::vector<ui::TouchscreenDevice>& touchscreen_devices = 18 const std::vector<ui::TouchscreenDevice>& touchscreen_devices =
19 ui::DeviceDataManager::GetInstance()->touchscreen_devices(); 19 ui::DeviceDataManager::GetInstance()->touchscreen_devices();
20 for (const ui::TouchscreenDevice& device : touchscreen_devices) { 20 for (const ui::TouchscreenDevice& device : touchscreen_devices) {
21 if (device.touch_points > max_touch) 21 if (device.touch_points > max_touch)
22 max_touch = device.touch_points; 22 max_touch = device.touch_points;
23 } 23 }
24 return max_touch; 24 return max_touch;
25 } 25 }
26 26
27 // TODO(mustaq@chromium.org): Use mouse detection logic. crbug.com/440503 27 // TODO(mustaq@chromium.org): Use mouse detection logic. crbug.com/440503
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 int available_hover_types = GetAvailableHoverTypes(); 60 int available_hover_types = GetAvailableHoverTypes();
61 if (available_hover_types & HOVER_TYPE_HOVER) 61 if (available_hover_types & HOVER_TYPE_HOVER)
62 return HOVER_TYPE_HOVER; 62 return HOVER_TYPE_HOVER;
63 if (available_hover_types & HOVER_TYPE_ON_DEMAND) 63 if (available_hover_types & HOVER_TYPE_ON_DEMAND)
64 return HOVER_TYPE_ON_DEMAND; 64 return HOVER_TYPE_ON_DEMAND;
65 DCHECK_EQ(available_hover_types, HOVER_TYPE_NONE); 65 DCHECK_EQ(available_hover_types, HOVER_TYPE_NONE);
66 return HOVER_TYPE_NONE; 66 return HOVER_TYPE_NONE;
67 } 67 }
68 68
69 } // namespace ui 69 } // namespace ui
OLDNEW
« no previous file with comments | « ui/base/touch/touch_device_aurax11.cc ('k') | ui/base/touch/touch_device_ozone.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698