Move ash::DisplayInfo to ui

ash/display/display_change_observer_chromeos.cc

Index: ash/display/display_change_observer_chromeos.cc
diff --git a/ash/display/display_change_observer_chromeos.cc b/ash/display/display_change_observer_chromeos.cc
index 130a923cd33ca9df05304d1d421a2c562709859e..a601f994d966da5058fdfce4307d65be591defb3 100644
--- a/ash/display/display_change_observer_chromeos.cc
+++ b/ash/display/display_change_observer_chromeos.cc
@@ -75,35 +75,38 @@ void UpdateInternalDisplayId(
 }  // namespace
 
 // static
-DisplayInfo::ManagedDisplayModeList
+ui::DisplayInfo::ManagedDisplayModeList
 DisplayChangeObserver::GetInternalManagedDisplayModeList(
-    const DisplayInfo& display_info,
+    const ui::DisplayInfo& display_info,
     const ui::DisplaySnapshot& output) {
   const ui::DisplayMode* ui_native_mode = output.native_mode();
-  scoped_refptr<ManagedDisplayMode> native_mode = new ManagedDisplayMode(
-      ui_native_mode->size(), ui_native_mode->refresh_rate(),
-      ui_native_mode->is_interlaced(), true, 1.0,
-      display_info.device_scale_factor());
+  scoped_refptr<ui::ManagedDisplayMode> native_mode =
+      new ui::ManagedDisplayMode(ui_native_mode->size(),
+                                 ui_native_mode->refresh_rate(),
+                                 ui_native_mode->is_interlaced(), true, 1.0,
+                                 display_info.device_scale_factor());
 
   return CreateInternalManagedDisplayModeList(native_mode);
 }
 
 // static
-DisplayInfo::ManagedDisplayModeList
+ui::DisplayInfo::ManagedDisplayModeList
 DisplayChangeObserver::GetExternalManagedDisplayModeList(
     const ui::DisplaySnapshot& output) {
   using DisplayModeMap =
-      std::map<std::pair<int, int>, scoped_refptr<ManagedDisplayMode>>;
+      std::map<std::pair<int, int>, scoped_refptr<ui::ManagedDisplayMode>>;
   DisplayModeMap display_mode_map;
 
-  scoped_refptr<ManagedDisplayMode> native_mode = new ManagedDisplayMode();
+  scoped_refptr<ui::ManagedDisplayMode> native_mode =
+      new ui::ManagedDisplayMode();
   for (const auto& mode_info : output.modes()) {
     const std::pair<int, int> size(mode_info->size().width(),
                                    mode_info->size().height());
-    scoped_refptr<ManagedDisplayMode> display_mode = new ManagedDisplayMode(
-        mode_info->size(), mode_info->refresh_rate(),
-        mode_info->is_interlaced(), output.native_mode() == mode_info.get(),
-        1.0, 1.0);
+    scoped_refptr<ui::ManagedDisplayMode> display_mode =
+        new ui::ManagedDisplayMode(mode_info->size(), mode_info->refresh_rate(),
+                                   mode_info->is_interlaced(),
+                                   output.native_mode() == mode_info.get(), 1.0,
+                                   1.0);
     if (display_mode->native())
       native_mode = display_mode;
 
@@ -117,7 +120,7 @@ DisplayChangeObserver::GetExternalManagedDisplayModeList(
       display_mode_it->second = std::move(display_mode);
   }
 
-  DisplayInfo::ManagedDisplayModeList display_mode_list;
+  ui::DisplayInfo::ManagedDisplayModeList display_mode_list;
   for (const auto& display_mode_pair : display_mode_map)
     display_mode_list.push_back(std::move(display_mode_pair.second));
 
@@ -135,7 +138,7 @@ DisplayChangeObserver::GetExternalManagedDisplayModeList(
 
   if (native_mode->size().width() >= kMinimumWidthFor4K) {
     for (size_t i = 0; i < arraysize(kAdditionalDeviceScaleFactorsFor4k); ++i) {
-      scoped_refptr<ManagedDisplayMode> mode = new ManagedDisplayMode(
+      scoped_refptr<ui::ManagedDisplayMode> mode = new ui::ManagedDisplayMode(
           native_mode->size(), native_mode->refresh_rate(),
           native_mode->is_interlaced(), false /* native */,
           native_mode->ui_scale(), kAdditionalDeviceScaleFactorsFor4k[i]);
@@ -177,7 +180,7 @@ ui::MultipleDisplayState DisplayChangeObserver::GetStateForDisplayIds(
 
 bool DisplayChangeObserver::GetResolutionForDisplayId(int64_t display_id,
                                                       gfx::Size* size) const {
-  scoped_refptr<ManagedDisplayMode> mode =
+  scoped_refptr<ui::ManagedDisplayMode> mode =
       Shell::GetInstance()->display_manager()->GetSelectedModeForDisplayId(
           display_id);
   if (!mode)
@@ -190,7 +193,7 @@ void DisplayChangeObserver::OnDisplayModeChanged(
     const ui::DisplayConfigurator::DisplayStateList& display_states) {
   UpdateInternalDisplayId(display_states);
 
-  std::vector<DisplayInfo> displays;
+  std::vector<ui::DisplayInfo> displays;
   std::set<int64_t> ids;
   for (const ui::DisplaySnapshot* state : display_states) {
     const ui::DisplayMode* mode_info = state->current_mode();
@@ -207,7 +210,7 @@ void DisplayChangeObserver::OnDisplayModeChanged(
       if (dpi)
         device_scale_factor = FindDeviceScaleFactor(dpi);
     } else {
-      scoped_refptr<ManagedDisplayMode> mode =
+      scoped_refptr<ui::ManagedDisplayMode> mode =
           Shell::GetInstance()->display_manager()->GetSelectedModeForDisplayId(
               state->display_id());
       if (mode) {
@@ -249,8 +252,8 @@ void DisplayChangeObserver::OnDisplayModeChanged(
     int64_t id = state->display_id();
     ids.insert(id);
 
-    displays.push_back(DisplayInfo(id, name, has_overscan));
-    DisplayInfo& new_info = displays.back();
+    displays.push_back(ui::DisplayInfo(id, name, has_overscan));
+    ui::DisplayInfo& new_info = displays.back();
     new_info.set_sys_path(state->sys_path());
     new_info.set_device_scale_factor(device_scale_factor);
     new_info.SetBounds(display_bounds);
@@ -260,7 +263,7 @@ void DisplayChangeObserver::OnDisplayModeChanged(
     if (dpi)
       new_info.set_device_dpi(dpi);
 
-    DisplayInfo::ManagedDisplayModeList display_modes =
+    ui::DisplayInfo::ManagedDisplayModeList display_modes =
         (state->type() == ui::DISPLAY_CONNECTION_TYPE_INTERNAL)
             ? GetInternalManagedDisplayModeList(new_info, *state)
             : GetExternalManagedDisplayModeList(*state);