Revert of chromeos: Makes mushrome use simplified display management

ash/mus/window_manager.cc

Index: ash/mus/window_manager.cc
diff --git a/ash/mus/window_manager.cc b/ash/mus/window_manager.cc
index b7cf573e32728bc6da710e6c9b47acadef7e83c1..0b7c4ae2559f3628ffeca62d90d2bc94bec47ec0 100644
--- a/ash/mus/window_manager.cc
+++ b/ash/mus/window_manager.cc
@@ -75,11 +75,9 @@
 
 // TODO: need to register OSExchangeDataProviderMus. http://crbug.com/665077.
 WindowManager::WindowManager(service_manager::Connector* connector,
-                             Config config,
-                             bool show_primary_host_on_connect)
+                             Config config)
     : connector_(connector),
       config_(config),
-      show_primary_host_on_connect_(show_primary_host_on_connect),
       wm_state_(base::MakeUnique<::wm::WMState>()),
       property_converter_(base::MakeUnique<aura::PropertyConverter>()) {
   property_converter_->RegisterProperty(
@@ -124,14 +122,12 @@
   DCHECK_EQ(nullptr, ash::Shell::window_tree_client());
   ash::Shell::set_window_tree_client(window_tree_client_.get());
 
-  // TODO(sky): remove and use MUS code.
-  if (config_ == Config::MASH) {
-    // |connector_| is null in some tests.
-    if (connector_)
-      connector_->BindInterface(ui::mojom::kServiceName, &display_controller_);
-    screen_ = base::MakeUnique<ScreenMus>(display_controller_.get());
-    display::Screen::SetScreenInstance(screen_.get());
-  }
+  // |connector_| will be null in some tests.
+  if (connector_)
+    connector_->BindInterface(ui::mojom::kServiceName, &display_controller_);
+
+  screen_ = base::MakeUnique<ScreenMus>(display_controller_.get());
+  display::Screen::SetScreenInstance(screen_.get());
 
   pointer_watcher_event_router_ =
       base::MakeUnique<views::PointerWatcherEventRouter>(
@@ -233,10 +229,10 @@
   DCHECK(!created_shell_);
   created_shell_ = true;
   ShellInitParams init_params;
-  ShellPortMash* shell_port = new ShellPortMash(
-      window_tree_host ? WmWindow::Get(window_tree_host->window()) : nullptr,
-      this, pointer_watcher_event_router_.get(),
-      create_session_state_delegate_stub_for_test_);
+  ShellPortMash* shell_port =
+      new ShellPortMash(WmWindow::Get(window_tree_host->window()), this,
+                        pointer_watcher_event_router_.get(),
+                        create_session_state_delegate_stub_for_test_);
   // Shell::CreateInstance() takes ownership of ShellDelegate.
   init_params.delegate = shell_delegate_ ? shell_delegate_.release()
                                          : new ShellDelegateMus(connector_);
@@ -340,14 +336,7 @@
   ash::Shell::set_window_manager_client(client);
 }
 
-void WindowManager::OnWmConnected() {
-  if (config_ != Config::MUS)
-    return;
-
-  CreateShell(nullptr);
-  if (show_primary_host_on_connect_)
-    Shell::GetPrimaryRootWindow()->GetHost()->Show();
-}
+void WindowManager::OnWmConnected() {}
 
 void WindowManager::OnWmSetBounds(aura::Window* window,
                                   const gfx::Rect& bounds) {