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

Unified Diff: ash/system/chromeos/tray_display.h

Issue 2270553002: Move ash::DisplayInfo to ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: build 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
Index: ash/system/chromeos/tray_display.h
diff --git a/ash/system/chromeos/tray_display.h b/ash/system/chromeos/tray_display.h
index c7e55eabe21c922914f32965d0bc823d3dc17140..16be4e88f9c00cb0343ee8648e04a8452ddb3b4d 100644
--- a/ash/system/chromeos/tray_display.h
+++ b/ash/system/chromeos/tray_display.h
@@ -10,11 +10,11 @@
#include <map>
#include "ash/ash_export.h"
-#include "ash/common/display/display_info.h"
#include "ash/common/system/tray/system_tray_item.h"
#include "ash/common/wm_display_observer.h"
#include "base/macros.h"
#include "base/strings/string16.h"
+#include "ui/display/manager/managed_display_info.h"
#include "ui/views/view.h"
namespace ash {
@@ -32,7 +32,7 @@ class ASH_EXPORT TrayDisplay : public SystemTrayItem, public WmDisplayObserver {
private:
friend class TrayDisplayTest;
- typedef std::map<int64_t, DisplayInfo> DisplayInfoMap;
+ using DisplayInfoMap = std::map<int64_t, ui::ManagedDisplayInfo>;
static const char kNotificationId[];

Powered by Google App Engine
This is Rietveld 408576698