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

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

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/capabilities.cc ('k') | services/shell/public/cpp/lib/connection_impl.cc » ('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.h
diff --git a/services/shell/public/cpp/lib/connection_impl.h b/services/shell/public/cpp/lib/connection_impl.h
index 6bd8927aae27aa1ed69e872b34bbf6544453b059..246cdb2aba113ce198ac85f7d8f886dc67149b08 100644
--- a/services/shell/public/cpp/lib/connection_impl.h
+++ b/services/shell/public/cpp/lib/connection_impl.h
@@ -17,7 +17,7 @@
#include "services/shell/public/interfaces/connector.mojom.h"
#include "services/shell/public/interfaces/interface_provider.mojom.h"
-namespace mojo {
+namespace shell {
namespace internal {
// A ConnectionImpl represents each half of a connection between two
@@ -45,11 +45,11 @@ class ConnectionImpl : public Connection {
bool HasCapabilityClass(const std::string& class_name) const override;
const std::string& GetConnectionName() override;
const Identity& GetRemoteIdentity() const override;
- void SetConnectionLostClosure(const Closure& handler) override;
+ void SetConnectionLostClosure(const mojo::Closure& handler) override;
shell::mojom::ConnectResult GetResult() const override;
bool IsPending() const override;
uint32_t GetRemoteInstanceID() const override;
- void AddConnectionCompletedClosure(const Closure& callback) override;
+ void AddConnectionCompletedClosure(const mojo::Closure& callback) override;
bool AllowsInterface(const std::string& interface_name) const override;
shell::mojom::InterfaceProvider* GetRemoteInterfaces() override;
InterfaceRegistry* GetLocalRegistry() override;
@@ -65,7 +65,7 @@ class ConnectionImpl : public Connection {
State state_;
shell::mojom::ConnectResult result_ = shell::mojom::ConnectResult::SUCCEEDED;
- std::vector<Closure> connection_completed_callbacks_;
+ std::vector<mojo::Closure> connection_completed_callbacks_;
InterfaceRegistry local_registry_;
shell::mojom::InterfaceProviderPtr remote_interfaces_;
@@ -79,6 +79,6 @@ class ConnectionImpl : public Connection {
};
} // namespace internal
-} // namespace mojo
+} // namespace shell
#endif // SERVICES_SHELL_PUBLIC_CPP_LIB_CONNECTION_IMPL_H_
« no previous file with comments | « services/shell/public/cpp/lib/capabilities.cc ('k') | services/shell/public/cpp/lib/connection_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698