Save and restore unified mode

ash/display/display_layout_store.cc

 // Copyright 2013 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 <stdio.h>
 
 #include "ash/ash_switches.h"
 #include "ash/display/display_layout_store.h"
+#include "ash/display/display_manager.h"
+#include "ash/shell.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "ui/gfx/display.h"
 
 namespace ash {
 
 DisplayLayoutStore::DisplayLayoutStore() {
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
   if (command_line->HasSwitch(switches::kAshSecondaryDisplayLayout)) {
     std::string value = command_line->GetSwitchValueASCII(
@@ skipping 41 matching lines @@
 DisplayLayout DisplayLayoutStore::ComputeDisplayLayoutForDisplayIdPair(
     const DisplayIdPair& pair) {
   DisplayLayout layout = GetRegisteredDisplayLayout(pair);
   DCHECK_NE(layout.primary_id, gfx::Display::kInvalidDisplayID);
   // Invert if the primary was swapped. If mirrored, first is always
   // primary.
   return (layout.primary_id == gfx::Display::kInvalidDisplayID ||
           pair.first == layout.primary_id) ? layout : layout.Invert();
 }
 
-void DisplayLayoutStore::UpdateMirrorStatus(const DisplayIdPair& pair,
-                                            bool mirrored) {
+void DisplayLayoutStore::UpdateMultiDisplayState(const DisplayIdPair& pair,
+                                                 bool mirrored,
+                                                 bool default_unified) {
   if (paired_layouts_.find(pair) == paired_layouts_.end())
     CreateDisplayLayout(pair);
   paired_layouts_[pair].mirrored = mirrored;
+  paired_layouts_[pair].default_unified = default_unified;
 }
 
 void DisplayLayoutStore::UpdatePrimaryDisplayId(const DisplayIdPair& pair,
                                                 int64 display_id) {
   if (paired_layouts_.find(pair) == paired_layouts_.end())
     CreateDisplayLayout(pair);
   paired_layouts_[pair].primary_id = display_id;
 }
 
 DisplayLayout DisplayLayoutStore::CreateDisplayLayout(
     const DisplayIdPair& pair) {
   DisplayLayout layout = default_display_layout_;
+  layout.default_unified =
+      Shell::GetInstance()->display_manager()->default_multi_display_mode() ==
+      DisplayManager::UNIFIED;
   layout.primary_id = pair.first;
   paired_layouts_[pair] = layout;
   return layout;
 }
 
 }  // namespace ash