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

Unified Diff: mash/screenlock/screenlock.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/screenlock/screenlock.h ('k') | mash/session/session.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mash/screenlock/screenlock.cc
diff --git a/mash/screenlock/screenlock.cc b/mash/screenlock/screenlock.cc
index 895c32a6b8f6c918e7e2d7b2a47252fa677355e2..2a47278398cfe6a7f850ee1a342dd439cdae6a95 100644
--- a/mash/screenlock/screenlock.cc
+++ b/mash/screenlock/screenlock.cc
@@ -75,23 +75,23 @@ class ScreenlockView : public views::WidgetDelegateView,
Screenlock::Screenlock() {}
Screenlock::~Screenlock() {}
-void Screenlock::OnStart(service_manager::ServiceContext* context) {
- tracing_.Initialize(context->connector(), context->identity().name());
+void Screenlock::OnStart() {
+ tracing_.Initialize(context()->connector(), context()->identity().name());
mash::session::mojom::SessionPtr session;
- context->connector()->ConnectToInterface("service:mash_session", &session);
+ context()->connector()->ConnectToInterface("service:mash_session", &session);
session->AddScreenlockStateListener(
bindings_.CreateInterfacePtrAndBind(this));
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());
views::Widget* widget = new views::Widget;
views::Widget::InitParams params(
views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
- params.delegate = new ScreenlockView(context->connector());
+ params.delegate = new ScreenlockView(context()->connector());
std::map<std::string, std::vector<uint8_t>> properties;
properties[ui::mojom::WindowManager::kInitialContainerId_Property] =
« no previous file with comments | « mash/screenlock/screenlock.h ('k') | mash/session/session.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698