Move display preference code from ash/display/ to ui/display/manager/.

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_pref_util.h"
-#include "ash/display/json_converter.h"
 #include "ash/shell.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/sys_info.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/common/pref_names.h"
 #include "components/prefs/pref_registry_simple.h"
 #include "components/prefs/pref_service.h"
 #include "components/prefs/scoped_user_pref_update.h"
 #include "components/user_manager/user_manager.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 #include "ui/display/display.h"
 #include "ui/display/manager/display_layout_store.h"
 #include "ui/display/manager/display_manager.h"
 #include "ui/display/manager/display_manager_utilities.h"
+#include "ui/display/manager/display_pref_util.h"
+#include "ui/display/manager/json_converter.h"
 #include "ui/display/types/display_constants.h"
 #include "ui/gfx/geometry/insets.h"
 #include "url/url_canon.h"
 #include "url/url_util.h"
 
 namespace chromeos {
 namespace {
 
 const char kInsetsTopKey[] = "insets_top";
 const char kInsetsLeftKey[] = "insets_left";
@@ skipping 160 matching lines @@
 void LoadDisplayLayouts() {
   PrefService* local_state = g_browser_process->local_state();
   display::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()) {
     std::unique_ptr<display::DisplayLayout> layout(new display::DisplayLayout);
-    if (!ash::JsonToDisplayLayout(it.value(), layout.get())) {
+    if (!display::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;
@@ skipping 87 matching lines @@
 
   PrefService* local_state = g_browser_process->local_state();
   DictionaryPrefUpdate update(local_state, prefs::kSecondaryDisplays);
   base::DictionaryValue* pref_data = update.Get();
   std::unique_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()))
+  if (display::DisplayLayoutToJson(display_layout, layout_value.get()))
     pref_data->Set(name, layout_value.release());
 }
 
 void StoreCurrentDisplayLayoutPrefs() {
   display::DisplayManager* display_manager = GetDisplayManager();
   if (!UserCanSaveDisplayPreference() ||
       display_manager->num_connected_displays() < 2) {
     return;
   }
 
@@ skipping 47 matching lines @@
       TouchDataToValue(info.GetTouchCalibrationData(), property_value.get());
     pref_data->Set(base::Int64ToString(id), property_value.release());
   }
 }
 
 typedef std::map<chromeos::DisplayPowerState, std::string>
     DisplayPowerStateToStringMap;
 
 const DisplayPowerStateToStringMap* GetDisplayPowerStateToStringMap() {
   // Don't save or retore ALL_OFF state. crbug.com/318456.
-  static const DisplayPowerStateToStringMap* map = ash::CreateToStringMap(
+  static const DisplayPowerStateToStringMap* map = display::CreateToStringMap(
       chromeos::DISPLAY_POWER_ALL_ON, "all_on",
       chromeos::DISPLAY_POWER_INTERNAL_OFF_EXTERNAL_ON,
       "internal_off_external_on",
       chromeos::DISPLAY_POWER_INTERNAL_ON_EXTERNAL_OFF,
       "internal_on_external_off");
   return map;
 }
 
 bool GetDisplayPowerStateFromString(const base::StringPiece& state,
                                     chromeos::DisplayPowerState* field) {
-  if (ash::ReverseFind(GetDisplayPowerStateToStringMap(), state, field))
+  if (display::ReverseFind(GetDisplayPowerStateToStringMap(), state, field))
     return true;
   LOG(ERROR) << "Invalid display power state value:" << state;
   return false;
 }
 
 void StoreDisplayPowerState(DisplayPowerState power_state) {
   const DisplayPowerStateToStringMap* map = GetDisplayPowerStateToStringMap();
   DisplayPowerStateToStringMap::const_iterator iter = map->find(power_state);
   if (iter != map->end()) {
     PrefService* local_state = g_browser_process->local_state();
@@ skipping 84 matching lines @@
   StoreDisplayPowerState(power_state);
 }
 
 bool ParseTouchCalibrationStringForTest(
     const std::string& str,
     display::TouchCalibrationData::CalibrationPointPairQuad* point_pair_quad) {
   return ParseTouchCalibrationStringValue(str, point_pair_quad);
 }
 
 }  // namespace chromeos