Index: components/view_manager/connection_manager.h |
diff --git a/components/view_manager/connection_manager.h b/components/view_manager/connection_manager.h |
index 0940398b83105c55a2420acd8beb162fd4e4d475..a48a8fcc0a9a82dc7dc258a10dc268e87872abc7 100644 |
--- a/components/view_manager/connection_manager.h |
+++ b/components/view_manager/connection_manager.h |
@@ -19,6 +19,7 @@ |
#include "components/view_manager/public/interfaces/view_tree.mojom.h" |
#include "components/view_manager/server_view_delegate.h" |
#include "components/view_manager/server_view_observer.h" |
+#include "components/view_manager/surfaces/surfaces_state.h" |
#include "components/view_manager/view_manager_root_impl.h" |
#include "third_party/mojo/src/mojo/public/cpp/bindings/array.h" |
#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" |
@@ -71,7 +72,9 @@ class ConnectionManager : public ServerViewDelegate, |
DISALLOW_COPY_AND_ASSIGN(ScopedChange); |
}; |
- explicit ConnectionManager(ConnectionManagerDelegate* delegate); |
+ ConnectionManager( |
+ ConnectionManagerDelegate* delegate, |
+ const scoped_refptr<surfaces::SurfacesState>& surfaces_state); |
~ConnectionManager() override; |
// Adds a ViewManagerRoot. |
@@ -223,6 +226,7 @@ class ConnectionManager : public ServerViewDelegate, |
ViewManagerRootImpl* GetViewManagerRootByView(const ServerView* view) const; |
// Overridden from ServerViewDelegate: |
+ surfaces::SurfacesState* GetSurfacesState() override; |
void PrepareToDestroyView(ServerView* view) override; |
void PrepareToChangeViewHierarchy(ServerView* view, |
ServerView* new_parent, |
@@ -261,6 +265,9 @@ class ConnectionManager : public ServerViewDelegate, |
ConnectionManagerDelegate* delegate_; |
+ // State for rendering into a Surface. |
+ scoped_refptr<surfaces::SurfacesState> surfaces_state_; |
+ |
// ID to use for next ViewTreeImpl. |
mojo::ConnectionSpecificId next_connection_id_; |