Move ash::DisplayInfo to ui

chrome/browser/chromeos/display/display_preferences.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/display/display_preferences.h"
 
 #include <stddef.h>
 
 #include "ash/display/display_manager.h"
 #include "ash/display/display_pref_util.h"
@@ skipping 235 matching lines @@
   ash::DisplayManager* display_manager = GetDisplayManager();
   PrefService* local_state = g_browser_process->local_state();
 
   DictionaryPrefUpdate update(local_state, prefs::kDisplayProperties);
   base::DictionaryValue* pref_data = update.Get();
 
   size_t num = display_manager->GetNumDisplays();
   for (size_t i = 0; i < num; ++i) {
     const display::Display& display = display_manager->GetDisplayAt(i);
     int64_t id = display.id();
-    ash::DisplayInfo info = display_manager->GetDisplayInfo(id);
+    display::ManagedDisplayInfo info = display_manager->GetDisplayInfo(id);
 
     std::unique_ptr<base::DictionaryValue> property_value(
         new base::DictionaryValue());
     // Don't save the display preference in unified mode because its
     // size and modes can change depending on the combination of displays.
     if (display_manager->IsInUnifiedMode())
       continue;
     property_value->SetInteger("rotation",
                                static_cast<int>(info.GetRotation(
                                    display::Display::ROTATION_SOURCE_USER)));
     property_value->SetInteger(
         "ui-scale", static_cast<int>(info.configured_ui_scale() * 1000));
 
-    scoped_refptr<ash::ManagedDisplayMode> mode =
+    scoped_refptr<display::ManagedDisplayMode> mode =
         display_manager->GetSelectedModeForDisplayId(id);
     if (!display.IsInternal() && mode && !mode->native()) {
       property_value->SetInteger("width", mode->size().width());
       property_value->SetInteger("height", mode->size().height());
       property_value->SetInteger(
           "device-scale-factor",
           static_cast<int>(mode->device_scale_factor() * 1000));
     }
     if (!info.overscan_insets_in_dip().IsEmpty())
       InsetsToValue(info.overscan_insets_in_dip(), property_value.get());
@@ skipping 113 matching lines @@
                                    const display::DisplayLayout& layout) {
   StoreDisplayLayoutPref(list, layout);
 }
 
 // Stores the given |power_state|.
 void StoreDisplayPowerStateForTest(DisplayPowerState power_state) {
   StoreDisplayPowerState(power_state);
 }
 
 }  // namespace chromeos