Gets chrome --mus some what working

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>
 #include <set>
 
+#include "ash/common/shell_delegate.h"
 #include "ash/root_window_controller.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "services/ui/common/types.h"
 #include "services/ui/public/interfaces/display/display_controller.mojom.h"
 #include "services/ui/public/interfaces/window_manager.mojom.h"
 #include "ui/aura/mus/window_manager_delegate.h"
 #include "ui/aura/mus/window_tree_client_delegate.h"
 
 namespace base {
@@ skipping 13 matching lines @@
 }
 
 namespace wm {
 class WMState;
 }
 
 namespace ash {
 
 class RootWindowController;
 class ScreenMus;
-class ShellDelegate;
+
+enum class Config;
 
 namespace test {
 class AshTestHelper;
 }
 
 namespace mus {
 
 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:
-  explicit WindowManager(service_manager::Connector* connector);
+  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);
+            const scoped_refptr<base::SequencedWorkerPool>& blocking_pool,
+            std::unique_ptr<ash::ShellDelegate> shell_delegate = nullptr);
+
+  // Blocks waiting for the initial set of displays.
+  bool WaitForInitialDisplays();
 
   // Called during shutdown to delete all the RootWindowControllers.
   void DeleteAllRootWindowControllers();
 
+  Config config() const { return config_; }
+
   ScreenMus* screen() { return screen_.get(); }
 
   aura::WindowTreeClient* window_tree_client() {
     return window_tree_client_.get();
   }
 
   aura::WindowManagerClient* window_manager_client() {
     return window_manager_client_;
   }
 
@@ skipping 92 matching lines @@
   void OnWmSetClientArea(
       aura::Window* window,
       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_;
+
   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>
       pointer_watcher_event_router_;
 
   RootWindowControllers root_window_controllers_;
 
   std::unique_ptr<ScreenMus> screen_;
 
   bool created_shell_ = false;
 
   std::map<uint16_t, AcceleratorHandler*> accelerator_handlers_;
   uint16_t next_accelerator_namespace_id_ = 0u;
 
   scoped_refptr<base::SequencedWorkerPool> blocking_pool_;
 
-  // Only set in tests. If non-null this is used as the shell delegate.
-  std::unique_ptr<ShellDelegate> shell_delegate_for_test_;
+  // The ShellDelegate to install. This may be null, in which case
+  // ShellDelegateMus is used.
+  std::unique_ptr<ShellDelegate> shell_delegate_;
 
   // See WmShellMus's constructor for details. Tests may set to false.
   bool create_session_state_delegate_stub_for_test_ = true;
 
   // State that is only valid during a drag.
   struct DragState;
   std::unique_ptr<DragState> drag_state_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowManager);
 };
 
 }  // namespace mus
 }  // namespace ash
 
 #endif  // ASH_MUS_WINDOW_MANAGER_H_