Unified Desktop: hook up ash to allow unified desktop mode

chrome/browser/chromeos/display/display_preferences.cc

Index: chrome/browser/chromeos/display/display_preferences.cc
diff --git a/chrome/browser/chromeos/display/display_preferences.cc b/chrome/browser/chromeos/display/display_preferences.cc
index 8eda5017d1b92f95df31e525984fb71d9c018d5d..18e054b09e90b4c8bbf74888b14e62d8170484f6 100644
--- a/chrome/browser/chromeos/display/display_preferences.cc
+++ b/chrome/browser/chromeos/display/display_preferences.cc
@@ -225,14 +225,16 @@ void StoreDisplayLayoutPref(const ash::DisplayIdPair& pair,
 }
 
 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);
 }