| OLD | NEW |
|---|
| 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 #ifndef ASH_TOUCH_TOUCHSCREEN_UTIL_H_ | 5 #ifndef ASH_TOUCH_TOUCHSCREEN_UTIL_H_ |
| 6 #define ASH_TOUCH_TOUCHSCREEN_UTIL_H_ | 6 #define ASH_TOUCH_TOUCHSCREEN_UTIL_H_ |
| 7 | 7 |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "ash/ash_export.h" | 10 #include "ash/ash_export.h" |
| 11 #include "ash/common/display/display_info.h" | 11 #include "ui/display/manager/managed_display_info.h" |
| 12 #include "ui/events/devices/touchscreen_device.h" | 12 #include "ui/events/devices/touchscreen_device.h" |
| 13 | 13 |
| 14 namespace ash { | 14 namespace ash { |
| 15 | 15 |
| 16 // Given a list of displays and a list of touchscreens, associate them. The | 16 // Given a list of displays and a list of touchscreens, associate them. The |
| 17 // information in |displays| will be updated to reflect the mapping. | 17 // information in |displays| will be updated to reflect the mapping. |
| 18 ASH_EXPORT void AssociateTouchscreens( | 18 ASH_EXPORT void AssociateTouchscreens( |
| 19 std::vector<DisplayInfo>* displays, | 19 std::vector<display::ManagedDisplayInfo>* displays, |
| 20 const std::vector<ui::TouchscreenDevice>& touchscreens); | 20 const std::vector<ui::TouchscreenDevice>& touchscreens); |
| 21 | 21 |
| 22 } // namespace ash | 22 } // namespace ash |
| 23 | 23 |
| 24 #endif // ASH_TOUCH_TOUCHSCREEN_UTIL_H_ | 24 #endif // ASH_TOUCH_TOUCHSCREEN_UTIL_H_ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2270553002:
Move ash::DisplayInfo to ui (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master