Allow dynamic enabling/disabling of unified desktop

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/display/display_util.h"
@@ skipping 33 matching lines @@
   if (!command_line->HasSwitch(switches::kAshSecondaryDisplayLayout))
     default_display_layout_ = layout;
 }
 
 void DisplayLayoutStore::RegisterLayoutForDisplayIdPair(
     int64 id1,
     int64 id2,
     const DisplayLayout& layout) {
   auto key = CreateDisplayIdPair(id1, id2);
   paired_layouts_[key] = layout;
-#if defined(OS_CHROMEOS)
-  // Force disabling unified desktop if the flag is not set.
-  if (!switches::UnifiedDesktopEnabled())
-    paired_layouts_[key].default_unified = false;
-#endif
 }
 
 DisplayLayout DisplayLayoutStore::GetRegisteredDisplayLayout(
     const DisplayIdPair& pair) {
   std::map<DisplayIdPair, DisplayLayout>::const_iterator iter =
       paired_layouts_.find(pair);
   return
       iter != paired_layouts_.end() ? iter->second : CreateDisplayLayout(pair);
 }
 
@@ skipping 25 matching lines @@
 
 DisplayLayout DisplayLayoutStore::CreateDisplayLayout(
     const DisplayIdPair& pair) {
   DisplayLayout layout = default_display_layout_;
   layout.primary_id = pair.first;
   paired_layouts_[pair] = layout;
   return layout;
 }
 
 }  // namespace ash