Index: components/mus/connection_manager.cc |
diff --git a/components/mus/connection_manager.cc b/components/mus/connection_manager.cc |
index 8186ac28211f1ff76abb9e1b0168986d33bea98b..0bd66023585641f084e55c43b74b054b4075f333 100644 |
--- a/components/mus/connection_manager.cc |
+++ b/components/mus/connection_manager.cc |
@@ -20,7 +20,9 @@ |
#include "mojo/converters/surfaces/surfaces_type_converters.h" |
#include "ui/gfx/geometry/size_conversions.h" |
-namespace mus { |
+using mojo::ConnectionSpecificId; |
+ |
+namespace view_manager { |
ConnectionManager::ScopedChange::ScopedChange( |
ViewTreeImpl* connection, |
@@ -38,7 +40,7 @@ |
ConnectionManager::ConnectionManager( |
ConnectionManagerDelegate* delegate, |
- const scoped_refptr<SurfacesState>& surfaces_state) |
+ const scoped_refptr<surfaces::SurfacesState>& surfaces_state) |
: delegate_(delegate), |
surfaces_state_(surfaces_state), |
next_connection_id_(1), |
@@ -127,7 +129,7 @@ |
delegate_->OnNoMoreRootConnections(); |
} |
-void ConnectionManager::EmbedAtView(ConnectionSpecificId creator_id, |
+void ConnectionManager::EmbedAtView(mojo::ConnectionSpecificId creator_id, |
const ViewId& view_id, |
uint32_t policy_bitmask, |
mojo::URLRequestPtr request) { |
@@ -142,10 +144,11 @@ |
OnConnectionMessagedClient(client_connection->service()->id()); |
} |
-ViewTreeImpl* ConnectionManager::EmbedAtView(ConnectionSpecificId creator_id, |
- const ViewId& view_id, |
- uint32_t policy_bitmask, |
- mojo::ViewTreeClientPtr client) { |
+ViewTreeImpl* ConnectionManager::EmbedAtView( |
+ mojo::ConnectionSpecificId creator_id, |
+ const ViewId& view_id, |
+ uint32_t policy_bitmask, |
+ mojo::ViewTreeClientPtr client) { |
mojo::ViewTreePtr service_ptr; |
ClientConnection* client_connection = |
delegate_->CreateClientConnectionForEmbedAtView( |
@@ -332,7 +335,7 @@ |
return ConvertToCompositorFrame(input, this); |
} |
-SurfacesState* ConnectionManager::GetSurfacesState() { |
+surfaces::SurfacesState* ConnectionManager::GetSurfacesState() { |
return surfaces_state_.get(); |
} |
@@ -461,4 +464,4 @@ |
return true; |
} |
-} // namespace mus |
+} // namespace view_manager |