Unified Desktop: hook up ash to allow unified desktop mode

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_layout_store.h"
 #include "ash/display/display_manager.h"
 #include "ash/display/display_pref_util.h"
 #include "ash/shell.h"
@@ skipping 207 matching lines @@
   if (pref_data->HasKey(name)) {
     base::Value* value = NULL;
     if (pref_data->Get(name, &value) && value != NULL)
       layout_value.reset(value->DeepCopy());
   }
   if (ash::DisplayLayout::ConvertToValue(display_layout, layout_value.get()))
     pref_data->Set(name, layout_value.release());
 }
 
 void StoreCurrentDisplayLayoutPrefs() {
+  ash::DisplayManager* display_manager = GetDisplayManager();
   if (!UserCanSaveDisplayPreference() ||
-      GetDisplayManager()->num_connected_displays() < 2) {
+      display_manager->num_connected_displays() < 2 ||
+      display_manager->IsInUnifiedMode()) {
     return;
   }
 
-  ash::DisplayIdPair pair = GetDisplayManager()->GetCurrentDisplayIdPair();
+  ash::DisplayIdPair pair = display_manager->GetCurrentDisplayIdPair();
   ash::DisplayLayout display_layout =
-      GetDisplayManager()->layout_store()->GetRegisteredDisplayLayout(pair);
+      display_manager->layout_store()->GetRegisteredDisplayLayout(pair);
   StoreDisplayLayoutPref(pair, 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 144 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