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

Unified Diff: services/shell/public/cpp/lib/connection_impl.cc

Issue 1882423004: Move shell service to toplevel shell namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 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 | « services/shell/public/cpp/lib/connection_impl.h ('k') | services/shell/public/cpp/lib/connector_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/shell/public/cpp/lib/connection_impl.cc
diff --git a/services/shell/public/cpp/lib/connection_impl.cc b/services/shell/public/cpp/lib/connection_impl.cc
index b49cb8d68bad035dce9ea9b69d263410ef293a53..60fd9888f47160454caa22c542fc9d913fcd0bb6 100644
--- a/services/shell/public/cpp/lib/connection_impl.cc
+++ b/services/shell/public/cpp/lib/connection_impl.cc
@@ -13,7 +13,7 @@
#include "services/shell/public/cpp/connection.h"
#include "services/shell/public/cpp/interface_binder.h"
-namespace mojo {
+namespace shell {
namespace internal {
////////////////////////////////////////////////////////////////////////////////
@@ -65,7 +65,7 @@ const Identity& ConnectionImpl::GetRemoteIdentity() const {
return remote_;
}
-void ConnectionImpl::SetConnectionLostClosure(const Closure& handler) {
+void ConnectionImpl::SetConnectionLostClosure(const mojo::Closure& handler) {
remote_interfaces_.set_connection_error_handler(handler);
}
@@ -81,7 +81,8 @@ uint32_t ConnectionImpl::GetRemoteInstanceID() const {
return remote_id_;
}
-void ConnectionImpl::AddConnectionCompletedClosure(const Closure& callback) {
+void ConnectionImpl::AddConnectionCompletedClosure(
+ const mojo::Closure& callback) {
if (IsPending())
connection_completed_callbacks_.push_back(callback);
else
@@ -118,11 +119,11 @@ void ConnectionImpl::OnConnectionCompleted(shell::mojom::ConnectResult result,
State::CONNECTED : State::DISCONNECTED;
remote_id_ = target_application_id;
remote_.set_user_id(target_user_id);
- std::vector<Closure> callbacks;
+ std::vector<mojo::Closure> callbacks;
callbacks.swap(connection_completed_callbacks_);
for (auto callback : callbacks)
callback.Run();
}
} // namespace internal
-} // namespace mojo
+} // namespace shell
« no previous file with comments | « services/shell/public/cpp/lib/connection_impl.h ('k') | services/shell/public/cpp/lib/connector_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698