Move FrameSink hierarchy registration to DisplayCompositor interface

services/ui/ws/server_window.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 SERVICES_UI_WS_SERVER_WINDOW_H_
 #define SERVICES_UI_WS_SERVER_WINDOW_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 54 matching lines @@
       cc::mojom::MojoCompositorFrameSinkAssociatedRequest sink_request,
       cc::mojom::MojoCompositorFrameSinkClientPtr client,
       cc::mojom::DisplayPrivateAssociatedRequest display_request);
 
   void CreateCompositorFrameSink(
       cc::mojom::MojoCompositorFrameSinkRequest request,
       cc::mojom::MojoCompositorFrameSinkClientPtr client);
 
   const WindowId& id() const { return id_; }
 
+  const cc::FrameSinkId& frame_sink_id() const { return frame_sink_id_; }
+
   void Add(ServerWindow* child);
   void Remove(ServerWindow* child);
   void Reorder(ServerWindow* relative, mojom::OrderDirection diretion);
   void StackChildAtBottom(ServerWindow* child);
   void StackChildAtTop(ServerWindow* child);
 
   const gfx::Rect& bounds() const { return bounds_; }
   // Sets the bounds. If the size changes this implicitly resets the client
   // area to fill the whole bounds.
   void SetBounds(const gfx::Rect& bounds);
@@ skipping 119 matching lines @@
 #if !defined(NDEBUG) || defined(DCHECK_ALWAYS_ON)
   std::string GetDebugWindowHierarchy() const;
   std::string GetDebugWindowInfo() const;
   void BuildDebugInfo(const std::string& depth, std::string* result) const;
 #endif
 
  private:
   // Implementation of removing a window. Doesn't send any notification.
   void RemoveImpl(ServerWindow* window);
 
-  // Called when the root window changes from |old_root| to |new_root|. This is
-  // called after the window is moved from |old_root| to |new_root|.
-  void ProcessRootChanged(ServerWindow* old_root, ServerWindow* new_root);
-
   // Called when this window's stacking order among its siblings is changed.
   void OnStackingChanged();
 
   static void ReorderImpl(ServerWindow* window,
                           ServerWindow* relative,
                           mojom::OrderDirection diretion);
 
   // Returns a pointer to the stacking target that can be used by
   // RestackTransientDescendants.
   static ServerWindow** GetStackingTarget(ServerWindow* window);
 
   ServerWindowDelegate* delegate_;
   const WindowId id_;
+  cc::FrameSinkId frame_sink_id_;
   ServerWindow* parent_;
   Windows children_;
 
   // Transient window management.
   // If non-null we're actively restacking transient as the result of a
   // transient ancestor changing.
   ServerWindow* stacking_target_;
   ServerWindow* transient_parent_;
   Windows transient_children_;
 
@@ skipping 31 matching lines @@
 
   base::ObserverList<ServerWindowObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(ServerWindow);
 };
 
 }  // namespace ws
 }  // namespace ui
 
 #endif  // SERVICES_UI_WS_SERVER_WINDOW_H_