Makes it possible for clients to directly create WindowTreeHostMus

ui/aura/mus/window_tree_client.h

 // Copyright 2014 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 UI_AURA_MUS_WINDOW_TREE_CLIENT_H_
 #define UI_AURA_MUS_WINDOW_TREE_CLIENT_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 40 matching lines @@
 class InFlightPropertyChange;
 class InFlightVisibleChange;
 class WindowMus;
 class WindowPortMus;
 struct WindowPortInitData;
 struct WindowPortPropertyData;
 class WindowTreeClientDelegate;
 class WindowTreeClientPrivate;
 class WindowTreeClientObserver;
 class WindowTreeHost;
+class WindowTreeHostMus;
 
 namespace client {
 class FocusClient;
 }
 
 using EventResultCallback = base::Callback<void(ui::mojom::EventResult)>;
 
 // Manages the connection with mus.
 //
 // WindowTreeClient is owned by the creator. Generally when the delegate gets
@@ skipping 17 matching lines @@
       WindowManagerDelegate* window_manager_delegate = nullptr,
       ui::mojom::WindowTreeClientRequest request = nullptr);
   ~WindowTreeClient() override;
 
   // Establishes the connection by way of the WindowTreeFactory.
   void ConnectViaWindowTreeFactory(service_manager::Connector* connector);
 
   // Establishes the connection by way of WindowManagerWindowTreeFactory.
   void ConnectAsWindowManager(service_manager::Connector* connector);
 
-  // Wait for OnEmbed(), returning when done.
-  void WaitForEmbed();
-
   bool connected() const { return tree_ != nullptr; }
   ClientSpecificId client_id() const { return client_id_; }
 
   void SetClientArea(Window* window,
                      const gfx::Insets& client_area,
                      const std::vector<gfx::Rect>& additional_client_areas);
   void SetHitTestMask(Window* window, const gfx::Rect& mask);
   void ClearHitTestMask(Window* window);
   void SetCanFocus(Window* window, bool can_focus);
   void SetCanAcceptDrops(Id window_id, bool can_accept_drops);
@@ skipping 88 matching lines @@
   // Returns true if there is an InFlightChange that matches |change|. If there
   // is an existing change SetRevertValueFrom() is invoked on it. Returns false
   // if there is no InFlightChange matching |change|.
   // See InFlightChange for details on how InFlightChanges are used.
   bool ApplyServerChangeToExistingInFlightChange(const InFlightChange& change);
 
   void BuildWindowTree(const mojo::Array<ui::mojom::WindowDataPtr>& windows,
                        WindowMus* initial_parent);
 
   // Creates a WindowPortMus from the server side data.
-  // NOTE: this *must* be followed by SetLocalPropertiesFromServerProperties()
   std::unique_ptr<WindowPortMus> CreateWindowPortMus(
-      const ui::mojom::WindowDataPtr& window_data);
+      const ui::mojom::WindowDataPtr& window_data,
+      WindowMusType window_mus_type);
 
   // Sets local properties on the associated Window from the server properties.
   void SetLocalPropertiesFromServerProperties(
       WindowMus* window,
       const ui::mojom::WindowDataPtr& window_data);
 
-  // Creates a WindowTreeHostMus and returns the window associated with it.
-  // The returned window is either the content window of the WindowTreeHostMus
-  // or the window created by WindowTreeHost. See WindowTreeHostMus for
-  // details.
-  // TODO(sky): it would be nice to always have a single window and not the
-  // two different. That requires ownership changes to WindowTreeHost though.
-  Window* CreateWindowTreeHost(RootWindowType type,
-                               const ui::mojom::WindowDataPtr& window_data,
-                               int64_t display_id,
-                               Window* content_window);
+  // Creates a new WindowTreeHostMus.
+  std::unique_ptr<WindowTreeHostMus> CreateWindowTreeHost(
+      WindowMusType window_mus_type,
+      const ui::mojom::WindowDataPtr& window_data,
+      int64_t display_id);
 
   WindowMus* NewWindowFromWindowData(
       WindowMus* parent,
       const ui::mojom::WindowDataPtr& window_data);
 
   // Sets the ui::mojom::WindowTree implementation.
   void SetWindowTree(ui::mojom::WindowTreePtr window_tree_ptr);
 
   // Called when the connection to the server is established.
   void WindowTreeConnectionEstablished(ui::mojom::WindowTree* window_tree);
@@ skipping 22 matching lines @@
       int32_t event_id);
 
   void OnReceivedCursorLocationMemory(mojo::ScopedSharedBufferHandle handle);
 
   // Called when a property needs to change as the result of a change in the
   // server, or the server failing to accept a change.
   void SetWindowBoundsFromServer(WindowMus* window,
                                  const gfx::Rect& revert_bounds);
   void SetWindowVisibleFromServer(WindowMus* window, bool visible);
 
+  // Called from OnWindowMusBoundsChanged() and SetRootWindowBounds().
+  void ScheduleInFlightBoundsChange(WindowMus* window,
+                                    const gfx::Rect& old_bounds,
+                                    const gfx::Rect& new_bounds);
+
   // Following are called from WindowMus.
-  std::unique_ptr<WindowPortInitData> OnWindowMusCreated(WindowMus* window);
-  void OnWindowMusInitDone(WindowMus* window,
-                           std::unique_ptr<WindowPortInitData> init_data);
+  void OnWindowMusCreated(WindowMus* window);
   void OnWindowMusDestroyed(WindowMus* window);
   void OnWindowMusBoundsChanged(WindowMus* window,
                                 const gfx::Rect& old_bounds,
                                 const gfx::Rect& new_bounds);
   void OnWindowMusAddChild(WindowMus* parent, WindowMus* child);
   void OnWindowMusRemoveChild(WindowMus* parent, WindowMus* child);
   void OnWindowMusMoveChild(WindowMus* parent,
                             size_t current_index,
                             size_t dest_index);
   void OnWindowMusSetVisible(WindowMus* window, bool visible);
@@ skipping 136 matching lines @@
   void ActivateNextWindow() override;
   void SetUnderlaySurfaceOffsetAndExtendedHitArea(
       Window* window,
       const gfx::Vector2d& offset,
       const gfx::Insets& hit_area) override;
 
   // Overriden from client::FocusChangeObserver:
   void OnWindowFocused(Window* gained_focus, Window* lost_focus) override;
 
   // Overriden from WindowTreeHostMusDelegate:
-  void SetRootWindowBounds(Window* window, gfx::Rect* bounds) override;
+  void OnWindowTreeHostBoundsWillChange(WindowTreeHostMus* window_tree_host,
+                                        const gfx::Rect& bounds) override;
+  std::unique_ptr<WindowPortMus> CreateWindowPortForTopLevel() override;
+  void OnWindowTreeHostCreated(WindowTreeHostMus* window_tree_host) override;
 
   // Override from client::TransientWindowClientObserver:
   void OnTransientChildWindowAdded(Window* parent,
                                    Window* transient_child) override;
   void OnTransientChildWindowRemoved(Window* parent,
                                      Window* transient_child) override;
 
   // Overriden from DragDropControllerHost:
   uint32_t CreateChangeIdForDrag(WindowMus* window) override;
 
@@ skipping 70 matching lines @@
   std::unique_ptr<DragDropControllerMus> drag_drop_controller_;
 
   base::WeakPtrFactory<WindowTreeClient> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowTreeClient);
 };
 
 }  // namespace aura
 
 #endif  // UI_AURA_MUS_WINDOW_TREE_CLIENT_H_