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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/touch/touchscreen_util.h

Issue 2270553002: Move ash::DisplayInfo to ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebased Created 4 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/touch/touch_transformer_controller_unittest.cc ('k') | ash/touch/touchscreen_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/touch/touchscreen_util.h
diff --git a/ash/touch/touchscreen_util.h b/ash/touch/touchscreen_util.h
index 5cfe49e960465ab080869007a3415b3cacb47340..8d2f04c013cc7f8e0516652217a45b74ca02e732 100644
--- a/ash/touch/touchscreen_util.h
+++ b/ash/touch/touchscreen_util.h
@@ -8,7 +8,7 @@
#include <vector>
#include "ash/ash_export.h"
-#include "ash/common/display/display_info.h"
+#include "ui/display/manager/managed_display_info.h"
#include "ui/events/devices/touchscreen_device.h"
namespace ash {
@@ -16,7 +16,7 @@ namespace ash {
// Given a list of displays and a list of touchscreens, associate them. The
// information in |displays| will be updated to reflect the mapping.
ASH_EXPORT void AssociateTouchscreens(
- std::vector<DisplayInfo>* displays,
+ std::vector<display::ManagedDisplayInfo>* displays,
const std::vector<ui::TouchscreenDevice>& touchscreens);
} // namespace ash
« no previous file with comments | « ash/touch/touch_transformer_controller_unittest.cc ('k') | ash/touch/touchscreen_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698