| Index: mojo/services/view_manager/view_manager_connection.h
|
| diff --git a/mojo/services/view_manager/view_manager_connection.h b/mojo/services/view_manager/view_manager_connection.h
|
| index 2dc31d879f627c418e758c82b912e0b06e60afd5..51f16428869a4f3092d4477eb6cfec2d908f60da 100644
|
| --- a/mojo/services/view_manager/view_manager_connection.h
|
| +++ b/mojo/services/view_manager/view_manager_connection.h
|
| @@ -33,10 +33,8 @@ class MOJO_VIEW_MANAGER_EXPORT ViewManagerConnection
|
|
|
| TransportConnectionId id() const { return id_; }
|
|
|
| - // Invoked from Service when connection is established.
|
| - void Initialize(
|
| - ServiceConnector<ViewManagerConnection, RootNodeManager>* service_factory,
|
| - ScopedMessagePipeHandle client_handle);
|
| + // Invoked when connection is established.
|
| + void Initialize();
|
|
|
| // Returns the Node with the specified id.
|
| Node* GetNode(const NodeId& id);
|
| @@ -77,6 +75,7 @@ class MOJO_VIEW_MANAGER_EXPORT ViewManagerConnection
|
| TransportChangeId change_id);
|
|
|
| // Overridden from IViewManager:
|
| + virtual void SetClient(IViewManagerClient* client) OVERRIDE;
|
| virtual void CreateNode(TransportConnectionSpecificNodeId node_id,
|
| const Callback<void(bool)>& callback) OVERRIDE;
|
| virtual void DeleteNode(TransportNodeId transport_node_id,
|
| @@ -114,6 +113,8 @@ class MOJO_VIEW_MANAGER_EXPORT ViewManagerConnection
|
| const ViewId& new_view_id,
|
| const ViewId& old_view_id) OVERRIDE;
|
|
|
| + IViewManagerClient* client_;
|
| +
|
| // Id of this connection as assigned by RootNodeManager. Assigned in
|
| // Initialize().
|
| TransportConnectionId id_;
|
|
|