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

Unified Diff: mash/browser/browser.h

Issue 2646193002: Replace OnConnect with OnBindInterface in //mash. (Closed)
Patch Set: . Created 3 years, 11 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 | « no previous file | 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 9b27bcab31f31d7635288992f9bfa044f98475ed..b4689299493e85ef8b0a42df522756975d09b1af 100644
--- a/mash/browser/browser.h
+++ b/mash/browser/browser.h
@@ -10,6 +10,7 @@
#include "base/macros.h"
#include "mash/public/interfaces/launchable.mojom.h"
#include "mojo/public/cpp/bindings/binding_set.h"
+#include "services/service_manager/public/cpp/binder_registry.h"
#include "services/service_manager/public/cpp/interface_factory.h"
#include "services/service_manager/public/cpp/service.h"
#include "services/tracing/public/cpp/provider.h"
@@ -44,8 +45,9 @@ class Browser : public service_manager::Service,
private:
// service_manager::Service:
void OnStart() override;
- bool OnConnect(const service_manager::ServiceInfo& remote_info,
- service_manager::InterfaceRegistry* registry) override;
+ void OnBindInterface(const service_manager::ServiceInfo& source_info,
+ const std::string& interface_name,
+ mojo::ScopedMessagePipeHandle interface_pipe) override;
// mojom::Launchable:
void Launch(uint32_t what, mojom::LaunchMode how) override;
@@ -57,6 +59,8 @@ class Browser : public service_manager::Service,
mojo::BindingSet<mojom::Launchable> bindings_;
std::vector<views::Widget*> windows_;
+ service_manager::BinderRegistry registry_;
+
tracing::Provider tracing_;
std::unique_ptr<views::AuraInit> aura_init_;
« no previous file with comments | « no previous file | mash/browser/browser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698