Adds remainder of support for multiple roots to WS

components/mus/public/cpp/lib/window_tree_client_impl.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 COMPONENTS_MUS_PUBLIC_CPP_LIB_WINDOW_TREE_CLIENT_IMPL_H_
 #define COMPONENTS_MUS_PUBLIC_CPP_LIB_WINDOW_TREE_CLIENT_IMPL_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 48 matching lines @@
   void RemoveChild(Window* parent, Id child_id);
 
   void AddTransientWindow(Window* window, Id transient_window_id);
   void RemoveTransientWindowFromParent(Window* window);
 
   void Reorder(Window* window,
                Id relative_window_id,
                mojom::OrderDirection direction);
 
   // Returns true if the specified window was created by this connection.
-  bool OwnsWindow(Id id) const;
+  bool OwnsWindow(Window* window) const;
 
   void SetBounds(Window* window,
                  const gfx::Rect& old_bounds,
                  const gfx::Rect& bounds);
   void SetClientArea(Id window_id,
                      const gfx::Insets& client_area,
                      const std::vector<gfx::Rect>& additional_client_areas);
   void SetFocus(Window* window);
   void SetCanFocus(Id window_id, bool can_focus);
   void SetPredefinedCursor(Id window_id, mus::mojom::Cursor cursor_id);
@@ skipping 29 matching lines @@
 
   bool is_embed_root() const { return is_embed_root_; }
 
   // Called after the window's observers have been notified of destruction (as
   // the last step of ~Window).
   void OnWindowDestroyed(Window* window);
 
  private:
   friend class WindowTreeClientImplPrivate;
 
+  enum class NewWindowType {
+    CHILD,
+    TOP_LEVEL,
+  };
+
   using IdToWindowMap = std::map<Id, Window*>;
 
   using InFlightMap = std::map<uint32_t, scoped_ptr<InFlightChange>>;
 
   // Returns the oldest InFlightChange that matches |change|.
   InFlightChange* GetOldestInFlightChangeMatching(const InFlightChange& change);
 
   // See InFlightChange for details on how InFlightChanges are used.
   uint32_t ScheduleInFlightChange(scoped_ptr<InFlightChange> change);
 
   // 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);
 
+  Window* NewWindowImpl(NewWindowType type,
+                        const Window::SharedProperties* properties);
+
   // OnEmbed() calls into this. Exposed as a separate function for testing.
   void OnEmbedImpl(mojom::WindowTree* window_tree,
                    ConnectionSpecificId connection_id,
                    mojom::WindowDataPtr root_data,
                    Id focused_window_id,
                    uint32_t access_policy);
 
   // Overridden from WindowTreeConnection:
   void SetDeleteOnNoRoots(bool value) override;
   const std::set<Window*>& GetRoots() override;
   Window* GetWindowById(Id id) override;
   Window* GetFocusedWindow() override;
   Window* NewWindow(const Window::SharedProperties* properties) override;
+  Window* NewTopLevelWindow(
+      const Window::SharedProperties* properties) override;
   bool IsEmbedRoot() override;
   ConnectionSpecificId GetConnectionId() override;
   void AddObserver(WindowTreeConnectionObserver* observer) override;
   void RemoveObserver(WindowTreeConnectionObserver* observer) override;
 
   // Overridden from WindowTreeClient:
   void OnEmbed(ConnectionSpecificId connection_id,
                mojom::WindowDataPtr root,
                mojom::WindowTreePtr tree,
                Id focused_window_id,
@@ skipping 42 matching lines @@
       override;
 
   // Overridden from WindowManagerInternal:
   void WmSetBounds(uint32_t change_id,
                    Id window_id,
                    mojo::RectPtr transit_bounds) override;
   void WmSetProperty(uint32_t change_id,
                      Id window_id,
                      const mojo::String& name,
                      mojo::Array<uint8_t> transit_data) override;
+  void WmCreateTopLevelWindow(uint32_t change_id,
+                              mojo::Map<mojo::String, mojo::Array<uint8_t>>
+                                  transport_properties) override;
 
   // This is set once and only once when we get OnEmbed(). It gives the unique
   // id for this connection.
   ConnectionSpecificId connection_id_;
 
   // Id assigned to the next window created.
   ConnectionSpecificId next_window_id_;
 
   // Id used for the next change id supplied to the server.
   uint32_t next_change_id_;
@@ skipping 27 matching lines @@
       window_manager_internal_;
   mojom::WindowManagerInternalClientAssociatedPtr
       window_manager_internal_client_;
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(WindowTreeClientImpl);
 };
 
 }  // namespace mus
 
 #endif  // COMPONENTS_MUS_PUBLIC_CPP_LIB_WINDOW_TREE_CLIENT_IMPL_H_