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

Unified Diff: ash/display/display_change_observer_chromeos.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/dip_unittest.cc ('k') | ash/display/display_change_observer_chromeos.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/display_change_observer_chromeos.h
diff --git a/ash/display/display_change_observer_chromeos.h b/ash/display/display_change_observer_chromeos.h
index 25bff5d36f57ca63f63dc1067b2c713d270c9604..cbaa57623320b4b134d4b24f43db49b438e25cc0 100644
--- a/ash/display/display_change_observer_chromeos.h
+++ b/ash/display/display_change_observer_chromeos.h
@@ -10,10 +10,10 @@
#include <vector>
#include "ash/ash_export.h"
-#include "ash/common/display/display_info.h"
#include "ash/common/shell_observer.h"
#include "base/macros.h"
#include "ui/display/chromeos/display_configurator.h"
+#include "ui/display/manager/managed_display_info.h"
#include "ui/events/devices/input_device_event_observer.h"
namespace ash {
@@ -29,12 +29,13 @@ class DisplayChangeObserver : public ui::DisplayConfigurator::StateController,
public ShellObserver {
public:
// Returns the mode list for internal display.
- ASH_EXPORT static DisplayInfo::ManagedDisplayModeList
- GetInternalManagedDisplayModeList(const DisplayInfo& display_info,
- const ui::DisplaySnapshot& output);
+ ASH_EXPORT static display::ManagedDisplayInfo::ManagedDisplayModeList
+ GetInternalManagedDisplayModeList(
+ const display::ManagedDisplayInfo& display_info,
+ const ui::DisplaySnapshot& output);
// Returns the resolution list.
- ASH_EXPORT static DisplayInfo::ManagedDisplayModeList
+ ASH_EXPORT static display::ManagedDisplayInfo::ManagedDisplayModeList
GetExternalManagedDisplayModeList(const ui::DisplaySnapshot& output);
DisplayChangeObserver();
« no previous file with comments | « ash/dip_unittest.cc ('k') | ash/display/display_change_observer_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698