Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(261)

Unified Diff: components/mus/connection_manager.cc

Issue 1351013002: Revert of Mandoline UI Process: Update namespaces and file names (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/mus/connection_manager.h ('k') | components/mus/connection_manager_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « components/mus/connection_manager.h ('k') | components/mus/connection_manager_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698