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

Unified Diff: mash/task_viewer/task_viewer.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 | « mash/simple_wm/simple_wm.cc ('k') | mash/task_viewer/task_viewer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mash/task_viewer/task_viewer.h
diff --git a/mash/task_viewer/task_viewer.h b/mash/task_viewer/task_viewer.h
index 0f15d31db85123b19bd3db46a69d215fb78c858f..5d456b2e8afd73cbf12da2f6745c2eaffc8bdc2c 100644
--- a/mash/task_viewer/task_viewer.h
+++ b/mash/task_viewer/task_viewer.h
@@ -12,6 +12,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"
@@ -37,8 +38,9 @@ class TaskViewer
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;
// ::mash::mojom::Launchable:
void Launch(uint32_t what, ::mash::mojom::LaunchMode how) override;
@@ -50,6 +52,8 @@ class TaskViewer
mojo::BindingSet<::mash::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 | « mash/simple_wm/simple_wm.cc ('k') | mash/task_viewer/task_viewer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698