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

Unified Diff: mash/browser/browser.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 | « content/common/service_manager/service_manager_connection_impl.cc ('k') | mash/browser/browser.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mash/browser/browser.h
diff --git a/mash/browser/browser.h b/mash/browser/browser.h
index 2428b47af72fe693481224575711d75ff6ff76e7..f9fc353531d2d3eb1490f20a6db72cc795324f76 100644
--- a/mash/browser/browser.h
+++ b/mash/browser/browser.h
@@ -16,6 +16,10 @@
namespace navigation {
class View;
+}
+
+namespace service_manager {
+class ServiceContext;
}
namespace views {
@@ -44,7 +48,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;
@@ -54,6 +58,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 | « content/common/service_manager/service_manager_connection_impl.cc ('k') | mash/browser/browser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698