Revert of chromeos: Makes mushrome use simplified display management

ash/mus/window_manager.h

 // 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.
 
 #ifndef ASH_MUS_WINDOW_MANAGER_H_
 #define ASH_MUS_WINDOW_MANAGER_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 50 matching lines @@
 class AcceleratorHandler;
 class WmTestHelper;
 
 // WindowManager serves as the WindowManagerDelegate and
 // WindowTreeClientDelegate for mash. WindowManager creates (and owns)
 // a RootWindowController per Display. WindowManager takes ownership of
 // the WindowTreeClient.
 class WindowManager : public aura::WindowManagerDelegate,
                       public aura::WindowTreeClientDelegate {
  public:
-  // Set |show_primary_host_on_connect| to true if the initial display should
-  // be made visible.  Generally tests should use false, other places use true.
-  WindowManager(service_manager::Connector* connector,
-                Config config,
-                bool show_primary_host_on_connect);
+  WindowManager(service_manager::Connector* connector, Config config);
   ~WindowManager() override;
 
   void Init(std::unique_ptr<aura::WindowTreeClient> window_tree_client,
             const scoped_refptr<base::SequencedWorkerPool>& blocking_pool,
             std::unique_ptr<ash::ShellDelegate> shell_delegate = nullptr);
 
   // Sets the callback that is run once the connection to mus is lost. If not
   // set shutdown occurs when the connection is lost (the Shell is deleted).
   void SetLostConnectionCallback(base::OnceClosure closure);
 
@@ skipping 113 matching lines @@
       const gfx::Insets& insets,
       const std::vector<gfx::Rect>& additional_client_areas) override;
   bool IsWindowActive(aura::Window* window) override;
   void OnWmDeactivateWindow(aura::Window* window) override;
 
   service_manager::Connector* connector_;
   display::mojom::DisplayControllerPtr display_controller_;
 
   const Config config_;
 
-  const bool show_primary_host_on_connect_;
-
   base::OnceClosure lost_connection_callback_;
 
   std::unique_ptr<::wm::WMState> wm_state_;
   std::unique_ptr<aura::PropertyConverter> property_converter_;
 
   std::unique_ptr<aura::WindowTreeClient> window_tree_client_;
 
   aura::WindowManagerClient* window_manager_client_ = nullptr;
 
   std::unique_ptr<views::PointerWatcherEventRouter>
@@ skipping 23 matching lines @@
 
   std::unique_ptr<ui::InputDeviceClient> input_device_client_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowManager);
 };
 
 }  // namespace mus
 }  // namespace ash
 
 #endif  // ASH_MUS_WINDOW_MANAGER_H_