Move DisplayLayout and DisplayLayoutBuilder From ash To ui/display

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_layout_store.h"
 #include "ash/display/display_manager.h"
@@ skipping 100 matching lines @@
 }
 
 void LoadDisplayLayouts() {
   PrefService* local_state = g_browser_process->local_state();
   ash::DisplayLayoutStore* layout_store = GetDisplayManager()->layout_store();
 
   const base::DictionaryValue* layouts = local_state->GetDictionary(
       prefs::kSecondaryDisplays);
   for (base::DictionaryValue::Iterator it(*layouts);
        !it.IsAtEnd(); it.Advance()) {
-    scoped_ptr<ash::DisplayLayout> layout(new ash::DisplayLayout);
+    scoped_ptr<display::DisplayLayout> layout(new display::DisplayLayout);
     if (!ash::JsonToDisplayLayout(it.value(), layout.get())) {
       LOG(WARNING) << "Invalid preference value for " << it.key();
       continue;
     }
 
     if (it.key().find(",") != std::string::npos) {
       std::vector<std::string> ids_str = base::SplitString(
           it.key(), ",", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
       std::vector<int64_t> ids;
       for (std::string id_str : ids_str) {
         int64_t id;
         if (!base::StringToInt64(id_str, &id))
           continue;
         ids.push_back(id);
       }
-      ash::DisplayIdList list =
+      display::DisplayIdList list =
           ash::GenerateDisplayIdList(ids.begin(), ids.end());
       layout_store->RegisterLayoutForDisplayIdList(list, std::move(layout));
     }
   }
 }
 
 void LoadDisplayProperties() {
   PrefService* local_state = g_browser_process->local_state();
   const base::DictionaryValue* properties = local_state->GetDictionary(
       prefs::kDisplayProperties);
@@ skipping 57 matching lines @@
     return;
 
   int rotation = gfx::Display::ROTATE_0;
   if (!properties->GetInteger("orientation", &rotation))
     return;
 
   GetDisplayManager()->RegisterDisplayRotationProperties(rotation_lock,
       static_cast<gfx::Display::Rotation>(rotation));
 }
 
-void StoreDisplayLayoutPref(const ash::DisplayIdList& list,
-                            const ash::DisplayLayout& display_layout) {
+void StoreDisplayLayoutPref(const display::DisplayIdList& list,
+                            const display::DisplayLayout& display_layout) {
   std::string name = ash::DisplayIdListToString(list);
 
   PrefService* local_state = g_browser_process->local_state();
   DictionaryPrefUpdate update(local_state, prefs::kSecondaryDisplays);
   base::DictionaryValue* pref_data = update.Get();
   scoped_ptr<base::Value> layout_value(new base::DictionaryValue());
   if (pref_data->HasKey(name)) {
     base::Value* value = nullptr;
     if (pref_data->Get(name, &value) && value != nullptr)
       layout_value.reset(value->DeepCopy());
   }
   if (ash::DisplayLayoutToJson(display_layout, layout_value.get()))
     pref_data->Set(name, layout_value.release());
 }
 
 void StoreCurrentDisplayLayoutPrefs() {
   ash::DisplayManager* display_manager = GetDisplayManager();
   if (!UserCanSaveDisplayPreference() ||
       display_manager->num_connected_displays() < 2) {
     return;
   }
 
-  ash::DisplayIdList list = display_manager->GetCurrentDisplayIdList();
-  const ash::DisplayLayout& display_layout =
+  display::DisplayIdList list = display_manager->GetCurrentDisplayIdList();
+  const display::DisplayLayout& display_layout =
       display_manager->layout_store()->GetRegisteredDisplayLayout(list);
   StoreDisplayLayoutPref(list, display_layout);
 }
 
 void StoreCurrentDisplayProperties() {
   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();
@@ skipping 133 matching lines @@
     std::string value = local_state->GetString(prefs::kDisplayPowerState);
     chromeos::DisplayPowerState power_state;
     if (GetDisplayPowerStateFromString(value, &power_state)) {
       ash::Shell::GetInstance()->display_configurator()->SetInitialDisplayPower(
           power_state);
     }
   }
 }
 
 // Stores the display layout for given display pairs.
-void StoreDisplayLayoutPrefForTest(const ash::DisplayIdList& list,
-                                   const ash::DisplayLayout& layout) {
+void StoreDisplayLayoutPrefForTest(const display::DisplayIdList& list,
+                                   const display::DisplayLayout& layout) {
   StoreDisplayLayoutPref(list, layout);
 }
 
 // Stores the given |power_state|.
 void StoreDisplayPowerStateForTest(DisplayPowerState power_state) {
   StoreDisplayPowerState(power_state);
 }
 
 }  // namespace chromeos