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

Unified Diff: services/shell/public/cpp/lib/interface_registry.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
Index: services/shell/public/cpp/lib/interface_registry.cc
diff --git a/services/shell/public/cpp/lib/interface_registry.cc b/services/shell/public/cpp/lib/interface_registry.cc
index db883efa26bb54c6c63a0364c510ac4dad42d437..39e5d9010950ea331ec8d8dd73d65d0896004d61 100644
--- a/services/shell/public/cpp/lib/interface_registry.cc
+++ b/services/shell/public/cpp/lib/interface_registry.cc
@@ -6,17 +6,14 @@
#include "services/shell/public/cpp/connection.h"
-namespace mojo {
+namespace shell {
InterfaceRegistry::InterfaceRegistry(Connection* connection)
: InterfaceRegistry(nullptr, connection) {}
-InterfaceRegistry::InterfaceRegistry(
- shell::mojom::InterfaceProviderRequest request,
- Connection* connection)
- : binding_(this),
- connection_(connection),
- default_binder_(nullptr) {
+InterfaceRegistry::InterfaceRegistry(mojom::InterfaceProviderRequest request,
+ Connection* connection)
+ : binding_(this), connection_(connection), default_binder_(nullptr) {
if (!request.is_pending())
request = GetProxy(&client_handle_);
binding_.Bind(std::move(request));
@@ -28,13 +25,13 @@ InterfaceRegistry::~InterfaceRegistry() {
name_to_binder_.clear();
}
-shell::mojom::InterfaceProviderPtr InterfaceRegistry::TakeClientHandle() {
+mojom::InterfaceProviderPtr InterfaceRegistry::TakeClientHandle() {
return std::move(client_handle_);
}
-// shell::mojom::InterfaceProvider:
-void InterfaceRegistry::GetInterface(const String& interface_name,
- ScopedMessagePipeHandle handle) {
+// mojom::InterfaceProvider:
+void InterfaceRegistry::GetInterface(const mojo::String& interface_name,
+ mojo::ScopedMessagePipeHandle handle) {
auto iter = name_to_binder_.find(interface_name);
InterfaceBinder* binder = iter != name_to_binder_.end() ? iter->second :
default_binder_;
@@ -67,4 +64,4 @@ void InterfaceRegistry::RemoveInterfaceBinderForName(
name_to_binder_.erase(it);
}
-} // namespace mojo
+} // namespace shell
« no previous file with comments | « services/shell/public/cpp/lib/interface_factory_binder.h ('k') | services/shell/public/cpp/lib/message_loop_ref.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698