Save and restore unified mode

ash/display/display_layout.cc

Index: ash/display/display_layout.cc
diff --git a/ash/display/display_layout.cc b/ash/display/display_layout.cc
index a733e762a8242a5e3d1b3b56e326a5c129cc6a34..9d8942ed13441a31675d8629cc5390e7c34d2f03 100644
--- a/ash/display/display_layout.cc
+++ b/ash/display/display_layout.cc
@@ -24,6 +24,7 @@ const int kMaxValidOffset = 10000;
 const char kPositionKey[] = "position";
 const char kOffsetKey[] = "offset";
 const char kMirroredKey[] = "mirrored";
+const char kDefaultUnifiedKey[] = "default_unified";
 const char kPrimaryIdKey[] = "primary-id";
 
 typedef std::map<DisplayLayout::Position, std::string> PositionToStringMap;
@@ -69,6 +70,7 @@ DisplayLayout::DisplayLayout()
     : position(RIGHT),
       offset(0),
       mirrored(false),
+      default_unified(false),
       primary_id(gfx::Display::kInvalidDisplayID) {
 }
 
@@ -76,6 +78,7 @@ DisplayLayout::DisplayLayout(DisplayLayout::Position position, int offset)
     : position(position),
       offset(offset),
       mirrored(false),
+      default_unified(false),
       primary_id(gfx::Display::kInvalidDisplayID) {
   DCHECK_LE(TOP, position);
   DCHECK_GE(LEFT, position);
@@ -127,15 +130,16 @@ bool DisplayLayout::ConvertToValue(const DisplayLayout& layout,
   dict_value->SetString(kPositionKey, position_str);
   dict_value->SetInteger(kOffsetKey, layout.offset);
   dict_value->SetBoolean(kMirroredKey, layout.mirrored);
+  dict_value->SetBoolean(kDefaultUnifiedKey, layout.default_unified);
   dict_value->SetString(kPrimaryIdKey, base::Int64ToString(layout.primary_id));
   return true;
 }
 
 std::string DisplayLayout::ToString() const {
   const std::string position_str = GetStringFromPosition(position);
-  return base::StringPrintf(
-      "%s, %d%s",
-      position_str.c_str(), offset, mirrored ? ", mirrored" : "");
+  return base::StringPrintf("%s, %d%s%s", position_str.c_str(), offset,
+                            mirrored ? ", mirrored" : "",
+                            default_unified ? ", unified" : "");
 }
 
 // static
@@ -145,6 +149,8 @@ void DisplayLayout::RegisterJSONConverter(
       kPositionKey, &DisplayLayout::position, &GetPositionFromString);
   converter->RegisterIntField(kOffsetKey, &DisplayLayout::offset);
   converter->RegisterBoolField(kMirroredKey, &DisplayLayout::mirrored);
+  converter->RegisterBoolField(kDefaultUnifiedKey,
+                               &DisplayLayout::default_unified);
   converter->RegisterCustomField<int64>(
       kPrimaryIdKey, &DisplayLayout::primary_id, &GetDisplayIdFromString);
 }