Removes ash::mus::RootWindowController

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 23 matching lines @@
 namespace views {
 class PointerWatcherEventRouter;
 }
 
 namespace wm {
 class WMState;
 }
 
 namespace ash {
 
+class RootWindowController;
 class ScreenMus;
 class SystemTrayDelegate;
 
 namespace mus {
 
 class AcceleratorHandler;
-class RootWindowController;
 class ShadowController;
 class WmLookupMus;
 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 {
@@ skipping 16 matching lines @@
   aura::WindowManagerClient* window_manager_client() {
     return window_manager_client_;
   }
 
   service_manager::Connector* connector() { return connector_; }
 
   aura::PropertyConverter* property_converter() {
     return property_converter_.get();
   }
 
-  // Creates a new top level window.
-  aura::Window* NewTopLevelWindow(
-      ui::mojom::WindowType window_type,
-      std::map<std::string, std::vector<uint8_t>>* properties);
-
   std::set<RootWindowController*> GetRootWindowControllers();
 
   // Returns the next accelerator namespace id by value in |id|. Returns true
   // if there is another slot available, false if all slots are taken up.
   bool GetNextAcceleratorNamespaceId(uint16_t* id);
   void AddAcceleratorHandler(uint16_t id_namespace,
                              AcceleratorHandler* handler);
   void RemoveAcceleratorHandler(uint16_t id_namespace);
 
   // Returns the DisplayController interface if available. Will be null if no
   // service_manager::Connector was available, for example in some tests.
   display::mojom::DisplayController* GetDisplayController();
 
   // Called during creation of the shell to create a RootWindowController.
   // See comment in CreateRootWindowController() for details.
   void CreatePrimaryRootWindowController(
       std::unique_ptr<aura::WindowTreeHostMus> window_tree_host);
 
  private:
   friend class WmTestHelper;
 
   using RootWindowControllers = std::set<std::unique_ptr<RootWindowController>>;
 
   // Called once the first Display has been obtained.
   void CreateShell(
       std::unique_ptr<aura::WindowTreeHostMus> primary_window_tree_host);
 
-  void CreateRootWindowController(
+  void CreateAndRegisterRootWindowController(
       std::unique_ptr<aura::WindowTreeHostMus> window_tree_host,
       const display::Display& display,
       ash::RootWindowController::RootWindowType root_window_type);
 
   // Deletes the specified RootWindowController. Called when a display is
   // removed. |in_shutdown| is true if called from Shutdown().
   void DestroyRootWindowController(RootWindowController* root_window_controller,
                                    bool in_shutdown);
 
   void Shutdown();
 
   RootWindowController* GetPrimaryRootWindowController();
 
-  // Returns the RootWindowController where new top levels are created.
-  // |properties| is the properties supplied during window creation.
-  RootWindowController* GetRootWindowControllerForNewTopLevelWindow(
-      std::map<std::string, std::vector<uint8_t>>* properties);
-
   // WindowTreeClientDelegate:
   void OnEmbed(
       std::unique_ptr<aura::WindowTreeHostMus> window_tree_host) override;
   void OnEmbedRootDestroyed(aura::WindowTreeHostMus* window_tree_host) override;
   void OnLostConnection(aura::WindowTreeClient* client) override;
   void OnPointerEventObserved(const ui::PointerEvent& event,
                               aura::Window* target) override;
   aura::client::CaptureClient* GetCaptureClient() override;
   aura::PropertyConverter* GetPropertyConverter() override;
 
@@ skipping 63 matching lines @@
   // create the various test delegates rather than a member.
   std::unique_ptr<SystemTrayDelegate> system_tray_delegate_for_test_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowManager);
 };
 
 }  // namespace mus
 }  // namespace ash
 
 #endif  // ASH_MUS_WINDOW_MANAGER_H_