| 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 2c55e1ef12cde769578933418c3ac0c1bf8f750e..5667f07badfb5f7e52a8a1227cd7728e91686ac5 100644
|
| --- a/mojo/services/view_manager/view_manager_connection.h
|
| +++ b/mojo/services/view_manager/view_manager_connection.h
|
| @@ -113,7 +113,7 @@ class MOJO_VIEW_MANAGER_EXPORT ViewManagerConnection
|
| bool CanDeleteView(const ViewId& view_id) const;
|
| bool CanSetView(const Node* node, const ViewId& view_id) const;
|
| bool CanGetNodeTree(const Node* node) const;
|
| - bool CanConnect(const mojo::Array<uint32_t>& node_ids) const;
|
| + bool CanEmbed(const mojo::Array<uint32_t>& node_ids) const;
|
|
|
| // Deletes a node owned by this connection. Returns true on success. |source|
|
| // is the connection that originated the change.
|
| @@ -186,9 +186,9 @@ class MOJO_VIEW_MANAGER_EXPORT ViewManagerConnection
|
| virtual void SetNodeBounds(Id node_id,
|
| RectPtr bounds,
|
| const Callback<void(bool)>& callback) OVERRIDE;
|
| - virtual void Connect(const mojo::String& url,
|
| - mojo::Array<uint32_t> node_ids,
|
| - const mojo::Callback<void(bool)>& callback) OVERRIDE;
|
| + virtual void Embed(const mojo::String& url,
|
| + mojo::Array<uint32_t> node_ids,
|
| + const mojo::Callback<void(bool)>& callback) OVERRIDE;
|
|
|
| // Overridden from NodeDelegate:
|
| virtual void OnNodeHierarchyChanged(const Node* node,
|
|
|