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

Unified Diff: mash/quick_launch/quick_launch.h

Issue 2500683002: Revert of Service Manager: Remove ServiceContext* arg from Service::OnStart() (Closed)
Patch Set: 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/login/login.cc ('k') | mash/quick_launch/quick_launch.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mash/quick_launch/quick_launch.h
diff --git a/mash/quick_launch/quick_launch.h b/mash/quick_launch/quick_launch.h
index e4848756ce7a0e0b2f341dc74c8bed05598e4569..ae0e6409ce24990c372396ff54782c136a8106c3 100644
--- a/mash/quick_launch/quick_launch.h
+++ b/mash/quick_launch/quick_launch.h
@@ -13,6 +13,10 @@
#include "services/service_manager/public/cpp/interface_factory.h"
#include "services/service_manager/public/cpp/service.h"
#include "services/tracing/public/cpp/provider.h"
+
+namespace service_manager {
+class ServiceContext;
+}
namespace views {
class AuraInit;
@@ -35,7 +39,7 @@
private:
// service_manager::Service:
- void OnStart() override;
+ void OnStart(service_manager::ServiceContext* context) override;
bool OnConnect(const service_manager::ServiceInfo& remote_info,
service_manager::InterfaceRegistry* registry) override;
@@ -45,6 +49,8 @@
// service_manager::InterfaceFactory<mojom::Launchable>:
void Create(const service_manager::Identity& remote_identity,
mojom::LaunchableRequest request) override;
+
+ service_manager::ServiceContext* context_ = nullptr;
mojo::BindingSet<mojom::Launchable> bindings_;
std::vector<views::Widget*> windows_;
« no previous file with comments | « mash/login/login.cc ('k') | mash/quick_launch/quick_launch.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698