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

Unified Diff: mash/webtest/webtest.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 | « mash/webtest/webtest.h ('k') | media/mojo/clients/mojo_cdm_factory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mash/webtest/webtest.cc
diff --git a/mash/webtest/webtest.cc b/mash/webtest/webtest.cc
index 8cc9c1c087b46114f262e069ac2a54451df40e28..934e0312e6438e2c7a0e7cd8bec5d527455aa18e 100644
--- a/mash/webtest/webtest.cc
+++ b/mash/webtest/webtest.cc
@@ -156,7 +156,7 @@ void Webtest::RemoveWindow(views::Widget* window) {
base::MessageLoop::current()->QuitWhenIdle();
}
-void Webtest::OnStart(const shell::Identity& identity) {
+void Webtest::OnStart(const service_manager::Identity& identity) {
tracing_.Initialize(connector(), identity.name());
aura_init_.reset(
@@ -165,8 +165,8 @@ void Webtest::OnStart(const shell::Identity& identity) {
views::WindowManagerConnection::Create(connector(), identity);
}
-bool Webtest::OnConnect(const shell::Identity& remote_identity,
- shell::InterfaceRegistry* registry) {
+bool Webtest::OnConnect(const service_manager::Identity& remote_identity,
+ service_manager::InterfaceRegistry* registry) {
registry->AddInterface<mojom::Launchable>(this);
return true;
}
@@ -194,7 +194,7 @@ void Webtest::Launch(uint32_t what, mojom::LaunchMode how) {
AddWindow(window);
}
-void Webtest::Create(const shell::Identity& remote_identity,
+void Webtest::Create(const service_manager::Identity& remote_identity,
mojom::LaunchableRequest request) {
bindings_.AddBinding(this, std::move(request));
}
« no previous file with comments | « mash/webtest/webtest.h ('k') | media/mojo/clients/mojo_cdm_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698