Revert of chromeos: Makes mushrome use simplified display management

ash/mus/window_manager_application.h

Index: ash/mus/window_manager_application.h
diff --git a/ash/mus/window_manager_application.h b/ash/mus/window_manager_application.h
index e878d399e4b9b4e6ed06add4f089a1fb56d3154d..bbab43db21114caa99d3bbc287ba6184e61d6489 100644
--- a/ash/mus/window_manager_application.h
+++ b/ash/mus/window_manager_application.h
@@ -10,9 +10,7 @@
 #include <memory>
 #include <set>
 
-#include "ash/public/cpp/config.h"
 #include "ash/public/interfaces/wallpaper.mojom.h"
-#include "ash/shell_delegate.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "mojo/public/cpp/bindings/binding.h"
@@ -35,16 +33,11 @@
 }
 }
 
-namespace service_manager {
-class Connector;
-}
-
 namespace views {
 class AuraInit;
 }
 
 namespace ash {
-
 namespace test {
 class AshTestHelper;
 }
@@ -56,18 +49,10 @@
 // Hosts the window manager and the ash system user interface for mash.
 class WindowManagerApplication : public service_manager::Service {
  public:
-  // If |observer| is non-null it is added to the WindowManager once created.
-  // See WindowManager's constructor for details of
-  // |show_primary_host_on_connect|.
-  explicit WindowManagerApplication(
-      bool show_primary_host_on_connect,
-      Config ash_config = Config::MASH,
-      std::unique_ptr<ash::ShellDelegate> shell_delegate = nullptr);
+  WindowManagerApplication();
   ~WindowManagerApplication() override;
 
   WindowManager* window_manager() { return window_manager_.get(); }
-
-  service_manager::Connector* GetConnector();
 
  private:
   friend class ash::test::AshTestHelper;
@@ -90,8 +75,6 @@
                        const std::string& interface_name,
                        mojo::ScopedMessagePipeHandle interface_pipe) override;
 
-  const bool show_primary_host_on_connect_;
-
   tracing::Provider tracing_;
 
   std::unique_ptr<views::AuraInit> aura_init_;
@@ -107,10 +90,6 @@
 
   service_manager::BinderRegistry registry_;
 
-  std::unique_ptr<ShellDelegate> shell_delegate_;
-
-  const Config ash_config_;
-
   DISALLOW_COPY_AND_ASSIGN(WindowManagerApplication);
 };