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

Unified Diff: media/mojo/services/mojo_media_application.cc

Issue 2420253002: Rename shell namespace to service_manager (Closed)
Patch Set: . Created 4 years, 2 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 | « media/mojo/services/mojo_media_application.h ('k') | media/mojo/services/mojo_media_application_factory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/mojo/services/mojo_media_application.cc
diff --git a/media/mojo/services/mojo_media_application.cc b/media/mojo/services/mojo_media_application.cc
index 49a70454595a23361e0144727d7788603e3addf6..2216f7f0a17779c0c2a3a4c9eeab8721104a0fc7 100644
--- a/media/mojo/services/mojo_media_application.cc
+++ b/media/mojo/services/mojo_media_application.cc
@@ -27,12 +27,13 @@ MojoMediaApplication::MojoMediaApplication(
MojoMediaApplication::~MojoMediaApplication() {}
-void MojoMediaApplication::OnStart(const shell::Identity& identity) {
+void MojoMediaApplication::OnStart(const service_manager::Identity& identity) {
mojo_media_client_->Initialize();
}
-bool MojoMediaApplication::OnConnect(const shell::Identity& remote_identity,
- shell::InterfaceRegistry* registry) {
+bool MojoMediaApplication::OnConnect(
+ const service_manager::Identity& remote_identity,
+ service_manager::InterfaceRegistry* registry) {
registry->AddInterface<mojom::MediaService>(this);
return true;
}
@@ -42,14 +43,15 @@ bool MojoMediaApplication::OnStop() {
return true;
}
-void MojoMediaApplication::Create(const shell::Identity& remote_identity,
- mojom::MediaServiceRequest request) {
+void MojoMediaApplication::Create(
+ const service_manager::Identity& remote_identity,
+ mojom::MediaServiceRequest request) {
bindings_.AddBinding(this, std::move(request));
}
void MojoMediaApplication::CreateServiceFactory(
mojom::ServiceFactoryRequest request,
- shell::mojom::InterfaceProviderPtr remote_interfaces) {
+ service_manager::mojom::InterfaceProviderPtr remote_interfaces) {
// Ignore request if service has already stopped.
if (!mojo_media_client_)
return;
« no previous file with comments | « media/mojo/services/mojo_media_application.h ('k') | media/mojo/services/mojo_media_application_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698