chromeos: turn on simplified display management for mash

ash/mus/window_manager_application.cc

 // Copyright 2015 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/mus/window_manager_application.h"
 
 #include <utility>
 
 #include "ash/mojo_interface_factory.h"
 #include "ash/mus/network_connect_delegate_mus.h"
 #include "ash/mus/window_manager.h"
 #include "ash/public/cpp/config.h"
+#include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/system/power/power_status.h"
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "chromeos/audio/cras_audio_handler.h"
 #include "chromeos/cryptohome/system_salt_getter.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/network/network_connect.h"
@@ skipping 119 matching lines @@
       context()->connector(), context()->identity(), "ash_mus_resources.pak",
       "ash_mus_resources_200.pak", nullptr,
       views::AuraInit::Mode::AURA_MUS_WINDOW_MANAGER);
   window_manager_ = base::MakeUnique<WindowManager>(
       context()->connector(), ash_config_, show_primary_host_on_connect_);
 
   std::unique_ptr<aura::WindowTreeClient> window_tree_client =
       base::MakeUnique<aura::WindowTreeClient>(
           context()->connector(), window_manager_.get(), window_manager_.get());
   const bool automatically_create_display_roots =
-      window_manager_->config() == Config::MASH;
+      !Shell::ShouldEnableSimplifiedDisplayManagement(
+          window_manager_->config());
   window_tree_client->ConnectAsWindowManager(
       automatically_create_display_roots);
 
   const size_t kMaxNumberThreads = 3u;  // Matches that of content.
   const char kThreadNamePrefix[] = "MashBlocking";
   blocking_pool_ = new base::SequencedWorkerPool(
       kMaxNumberThreads, kThreadNamePrefix, base::TaskPriority::USER_VISIBLE);
   const bool init_network_handler = true;
   InitWindowManager(std::move(window_tree_client), blocking_pool_,
                     init_network_handler);
 }
 
 void WindowManagerApplication::OnBindInterface(
     const service_manager::BindSourceInfo& source_info,
     const std::string& interface_name,
     mojo::ScopedMessagePipeHandle interface_pipe) {
   registry_.BindInterface(source_info, interface_name,
                           std::move(interface_pipe));
 }
 
 }  // namespace mus
 }  // namespace ash