Allow dynamic enabling/disabling of unified desktop

ash/display/display_layout.cc

 // Copyright (c) 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 "ash/display/display_layout.h"
 
 #include "ash/ash_switches.h"
+#include "ash/display/display_manager.h"
 #include "ash/display/display_pref_util.h"
+#include "ash/shell.h"
 #include "base/json/json_value_converter.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
 #include "ui/gfx/display.h"
 
 namespace ash {
 namespace  {
@@ skipping 46 matching lines @@
 // static
 DisplayLayout DisplayLayout::FromInts(int position, int offsets) {
   return DisplayLayout(static_cast<Position>(position), offsets);
 }
 
 DisplayLayout::DisplayLayout()
     : position(RIGHT),
       offset(0),
       mirrored(false),
 #if defined(OS_CHROMEOS)
-      default_unified(switches::UnifiedDesktopEnabled()),
+      default_unified(true),
 #else
       default_unified(false),
 #endif
       primary_id(gfx::Display::kInvalidDisplayID) {
 }
 
 DisplayLayout::DisplayLayout(DisplayLayout::Position position, int offset)
     : position(position),
       offset(offset),
       mirrored(false),
 #if defined(OS_CHROMEOS)
-      default_unified(switches::UnifiedDesktopEnabled()),
+      default_unified(true),
 #else
       default_unified(false),
 #endif
       primary_id(gfx::Display::kInvalidDisplayID) {
   DCHECK_LE(TOP, position);
   DCHECK_GE(LEFT, position);
 
   // Set the default value to |position| in case position is invalid.  DCHECKs
   // above doesn't stop in Release builds.
   if (TOP > position || LEFT < position)
@@ skipping 41 matching lines @@
   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);
+  bool unified =
+      default_unified &&
+      Shell::GetInstance()->display_manager()->unified_desktop_enabled();
+
   return base::StringPrintf("%s, %d%s%s", position_str.c_str(), offset,
                             mirrored ? ", mirrored" : "",
-                            default_unified ? ", unified" : "");
+                            unified ? ", unified" : "");
 }
 
 // static
 void DisplayLayout::RegisterJSONConverter(
     base::JSONValueConverter<DisplayLayout>* converter) {
   converter->RegisterCustomField<Position>(
       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);
 }
 
 }  // namespace ash