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

Unified Diff: mash/quick_launch/quick_launch.cc

Issue 2435153004: Change Service contract to pass ServiceInfo instead of Identity (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/quick_launch/quick_launch.h ('k') | mash/screenlock/screenlock.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mash/quick_launch/quick_launch.cc
diff --git a/mash/quick_launch/quick_launch.cc b/mash/quick_launch/quick_launch.cc
index 03b70c95d81399f2764ba852ecd434f62009164f..4e22b145c635e67d3b8914da1ee820d209eb3ca2 100644
--- a/mash/quick_launch/quick_launch.cc
+++ b/mash/quick_launch/quick_launch.cc
@@ -163,18 +163,18 @@ void QuickLaunch::RemoveWindow(views::Widget* window) {
base::MessageLoop::current()->QuitWhenIdle();
}
-void QuickLaunch::OnStart(const service_manager::Identity& identity) {
- tracing_.Initialize(connector(), identity.name());
+void QuickLaunch::OnStart(const service_manager::ServiceInfo& info) {
+ tracing_.Initialize(connector(), info.identity.name());
aura_init_.reset(
new views::AuraInit(connector(), "views_mus_resources.pak"));
window_manager_connection_ =
- views::WindowManagerConnection::Create(connector(), identity);
+ views::WindowManagerConnection::Create(connector(), info.identity);
Launch(mojom::kWindow, mojom::LaunchMode::MAKE_NEW);
}
-bool QuickLaunch::OnConnect(const service_manager::Identity& remote_identity,
+bool QuickLaunch::OnConnect(const service_manager::ServiceInfo& remote_info,
service_manager::InterfaceRegistry* registry) {
registry->AddInterface<mojom::Launchable>(this);
return true;
« no previous file with comments | « mash/quick_launch/quick_launch.h ('k') | mash/screenlock/screenlock.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698