[Cleanup] Factor out layout store code from DisplayController

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 "ash/display/display_controller.h"
+#include "ash/display/display_layout_store.h"
 #include "ash/display/display_manager.h"
 #include "ash/display/display_pref_util.h"
 #include "ash/shell.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_service.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/values.h"
@@ skipping 57 matching lines @@
           !user_manager->IsLoggedInAsGuest() &&
           !user_manager->IsLoggedInAsStub());
 }
 
 ash::DisplayController* GetDisplayController() {
   return ash::Shell::GetInstance()->display_controller();
 }
 
 void LoadDisplayLayouts() {
   PrefService* local_state = g_browser_process->local_state();
-  ash::DisplayController* display_controller = GetDisplayController();
+  ash::internal::DisplayLayoutStore* layout_store =
+      GetDisplayManager()->layout_store();
 
   const base::DictionaryValue* layouts = local_state->GetDictionary(
       prefs::kSecondaryDisplays);
   for (DictionaryValue::Iterator it(*layouts); !it.IsAtEnd(); it.Advance()) {
     ash::DisplayLayout layout;
     if (!ash::DisplayLayout::ConvertFromValue(it.value(), &layout)) {
       LOG(WARNING) << "Invalid preference value for " << it.key();
       continue;
     }
 
     if (it.key().find(",") != std::string::npos) {
       std::vector<std::string> ids;
       base::SplitString(it.key(), ',', &ids);
       int64 id1 = gfx::Display::kInvalidDisplayID;
       int64 id2 = gfx::Display::kInvalidDisplayID;
       if (!base::StringToInt64(ids[0], &id1) ||
           !base::StringToInt64(ids[1], &id2) ||
           id1 == gfx::Display::kInvalidDisplayID ||
           id2 == gfx::Display::kInvalidDisplayID) {
         continue;
       }
-      display_controller->RegisterLayoutForDisplayIdPair(id1, id2, layout);
+      layout_store->RegisterLayoutForDisplayIdPair(id1, id2, layout);
     }
   }
 }
 
 void LoadDisplayProperties() {
   PrefService* local_state = g_browser_process->local_state();
   const base::DictionaryValue* properties = local_state->GetDictionary(
       prefs::kDisplayProperties);
   for (DictionaryValue::Iterator it(*properties); !it.IsAtEnd(); it.Advance()) {
     const base::DictionaryValue* dict_value = NULL;
@@ skipping 40 matching lines @@
       layout_value.reset(value->DeepCopy());
   }
   if (ash::DisplayLayout::ConvertToValue(display_layout, layout_value.get()))
     pref_data->Set(name, layout_value.release());
 }
 
 void StoreCurrentDisplayLayoutPrefs() {
   if (!IsValidUser() || GetDisplayManager()->num_connected_displays() < 2)
     return;
 
-  ash::DisplayController* display_controller = GetDisplayController();
-  ash::DisplayIdPair pair = display_controller->GetCurrentDisplayIdPair();
+  ash::DisplayIdPair pair = GetDisplayController()->GetCurrentDisplayIdPair();
   ash::DisplayLayout display_layout =
-      display_controller->GetRegisteredDisplayLayout(pair);
+      GetDisplayManager()->layout_store()->GetRegisteredDisplayLayout(pair);
   StoreDisplayLayoutPref(pair, display_layout);
 }
 
 void StoreCurrentDisplayProperties() {
   ash::internal::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 93 matching lines @@
                                    const ash::DisplayLayout& layout) {
   StoreDisplayLayoutPref(std::make_pair(id1, id2), layout);
 }
 
 // Stores the given |power_state|.
 void StoreDisplayPowerStateForTest(DisplayPowerState power_state) {
   StoreDisplayPowerState(power_state);
 }
 
 }  // namespace chromeos