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

Unified Diff: services/window_manager/window_manager_impl.cc

Issue 788453002: Put code in //services/window_manager in namespace window_manager (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years 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 | « services/window_manager/window_manager_impl.h ('k') | services/window_manager/window_manager_test_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/window_manager/window_manager_impl.cc
diff --git a/services/window_manager/window_manager_impl.cc b/services/window_manager/window_manager_impl.cc
index e751917feb288b3713c10ed83a3c4f394495c9ce..28c858dc5808716a08752d63c611b30d4004e49b 100644
--- a/services/window_manager/window_manager_impl.cc
+++ b/services/window_manager/window_manager_impl.cc
@@ -6,7 +6,10 @@
#include "services/window_manager/window_manager_app.h"
-namespace mojo {
+using mojo::Callback;
+using mojo::Id;
+
+namespace window_manager {
WindowManagerImpl::WindowManagerImpl(WindowManagerApp* window_manager,
bool from_vm)
@@ -19,7 +22,8 @@ WindowManagerImpl::~WindowManagerImpl() {
window_manager_->RemoveConnection(this);
}
-void WindowManagerImpl::Bind(ScopedMessagePipeHandle window_manager_pipe) {
+void WindowManagerImpl::Bind(
+ mojo::ScopedMessagePipeHandle window_manager_pipe) {
binding_.Bind(window_manager_pipe.Pass());
}
@@ -36,8 +40,8 @@ void WindowManagerImpl::NotifyWindowActivated(Id new_active_id,
}
void WindowManagerImpl::Embed(
- const String& url,
- InterfaceRequest<ServiceProvider> service_provider) {
+ const mojo::String& url,
+ mojo::InterfaceRequest<mojo::ServiceProvider> service_provider) {
window_manager_->Embed(url, service_provider.Pass());
}
@@ -78,4 +82,4 @@ void WindowManagerImpl::OnConnectionError() {
delete this;
}
-} // namespace mojo
+} // namespace window_manager
« no previous file with comments | « services/window_manager/window_manager_impl.h ('k') | services/window_manager/window_manager_test_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698