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

Unified Diff: mash/browser/browser.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/browser/browser.h ('k') | mash/browser/main.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mash/browser/browser.cc
diff --git a/mash/browser/browser.cc b/mash/browser/browser.cc
index 0c12635ce6aab95652c6690de7649ad0f8bf6624..898a45a1d382ef57f8866a3d422a7cc3ad35bf88 100644
--- a/mash/browser/browser.cc
+++ b/mash/browser/browser.cc
@@ -864,7 +864,7 @@ std::unique_ptr<navigation::View> Browser::CreateView() {
return base::MakeUnique<navigation::View>(std::move(factory));
}
-void Browser::OnStart(const shell::Identity& identity) {
+void Browser::OnStart(const service_manager::Identity& identity) {
tracing_.Initialize(connector(), identity.name());
aura_init_.reset(
@@ -873,8 +873,8 @@ void Browser::OnStart(const shell::Identity& identity) {
views::WindowManagerConnection::Create(connector(), identity);
}
-bool Browser::OnConnect(const shell::Identity& remote_identity,
- shell::InterfaceRegistry* registry) {
+bool Browser::OnConnect(const service_manager::Identity& remote_identity,
+ service_manager::InterfaceRegistry* registry) {
registry->AddInterface<mojom::Launchable>(this);
return true;
}
@@ -895,7 +895,7 @@ void Browser::Launch(uint32_t what, mojom::LaunchMode how) {
AddWindow(window);
}
-void Browser::Create(const shell::Identity& remote_identity,
+void Browser::Create(const service_manager::Identity& remote_identity,
mojom::LaunchableRequest request) {
bindings_.AddBinding(this, std::move(request));
}
« no previous file with comments | « mash/browser/browser.h ('k') | mash/browser/main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698