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

Unified Diff: mash/quick_launch/quick_launch.cc

Issue 2487573002: Service Manager: Remove ServiceContext* arg from Service::OnStart() (Closed)
Patch Set: rebase Created 4 years, 1 month 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 c8bcbbfdd7c2d2fc862dce3644c745c61c32f178..21f3dc92e0c0994c5563d6207cd74f00637f6f88 100644
--- a/mash/quick_launch/quick_launch.cc
+++ b/mash/quick_launch/quick_launch.cc
@@ -166,14 +166,13 @@ void QuickLaunch::RemoveWindow(views::Widget* window) {
base::MessageLoop::current()->QuitWhenIdle();
}
-void QuickLaunch::OnStart(service_manager::ServiceContext* context) {
- context_ = context;
- tracing_.Initialize(context->connector(), context->identity().name());
+void QuickLaunch::OnStart() {
+ tracing_.Initialize(context()->connector(), context()->identity().name());
aura_init_ = base::MakeUnique<views::AuraInit>(
- context->connector(), context->identity(), "views_mus_resources.pak");
+ context()->connector(), context()->identity(), "views_mus_resources.pak");
window_manager_connection_ = views::WindowManagerConnection::Create(
- context->connector(), context->identity());
+ context()->connector(), context()->identity());
Launch(mojom::kWindow, mojom::LaunchMode::MAKE_NEW);
}
@@ -192,10 +191,10 @@ void QuickLaunch::Launch(uint32_t what, mojom::LaunchMode how) {
return;
}
catalog::mojom::CatalogPtr catalog;
- context_->connector()->ConnectToInterface("service:catalog", &catalog);
+ context()->connector()->ConnectToInterface("service:catalog", &catalog);
views::Widget* window = views::Widget::CreateWindowWithContextAndBounds(
- new QuickLaunchUI(this, context_->connector(), std::move(catalog)),
+ new QuickLaunchUI(this, context()->connector(), std::move(catalog)),
nullptr, gfx::Rect(10, 640, 0, 0));
window->Show();
windows_.push_back(window);
« 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