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

Side by Side Diff: mash/task_viewer/task_viewer.h

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 unified diff | Download patch
« no previous file with comments | « mash/session/session.cc ('k') | mash/task_viewer/task_viewer.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef MASH_TASK_VIEWER_TASK_VIEWER_H_ 5 #ifndef MASH_TASK_VIEWER_TASK_VIEWER_H_
6 #define MASH_TASK_VIEWER_TASK_VIEWER_H_ 6 #define MASH_TASK_VIEWER_TASK_VIEWER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <memory> 9 #include <memory>
10 10
11 #include "base/callback.h" 11 #include "base/callback.h"
12 #include "base/macros.h" 12 #include "base/macros.h"
13 #include "mash/public/interfaces/launchable.mojom.h" 13 #include "mash/public/interfaces/launchable.mojom.h"
14 #include "mojo/public/cpp/bindings/binding_set.h" 14 #include "mojo/public/cpp/bindings/binding_set.h"
15 #include "services/service_manager/public/cpp/interface_factory.h" 15 #include "services/service_manager/public/cpp/interface_factory.h"
16 #include "services/service_manager/public/cpp/service.h" 16 #include "services/service_manager/public/cpp/service.h"
17 #include "services/tracing/public/cpp/provider.h" 17 #include "services/tracing/public/cpp/provider.h"
18 18
19 namespace service_manager {
20 class ServiceContext;
21 }
22
23 namespace views { 19 namespace views {
24 class AuraInit; 20 class AuraInit;
25 class Widget; 21 class Widget;
26 class WindowManagerConnection; 22 class WindowManagerConnection;
27 } 23 }
28 24
29 namespace mash { 25 namespace mash {
30 namespace task_viewer { 26 namespace task_viewer {
31 27
32 class TaskViewer : public service_manager::Service, 28 class TaskViewer : public service_manager::Service,
33 public mojom::Launchable, 29 public mojom::Launchable,
34 public service_manager::InterfaceFactory<mojom::Launchable> { 30 public service_manager::InterfaceFactory<mojom::Launchable> {
35 public: 31 public:
36 TaskViewer(); 32 TaskViewer();
37 ~TaskViewer() override; 33 ~TaskViewer() override;
38 34
39 void RemoveWindow(views::Widget* widget); 35 void RemoveWindow(views::Widget* widget);
40 36
41 private: 37 private:
42 // service_manager::Service: 38 // service_manager::Service:
43 void OnStart(service_manager::ServiceContext* context) override; 39 void OnStart() override;
44 bool OnConnect(const service_manager::ServiceInfo& remote_info, 40 bool OnConnect(const service_manager::ServiceInfo& remote_info,
45 service_manager::InterfaceRegistry* registry) override; 41 service_manager::InterfaceRegistry* registry) override;
46 42
47 // mojom::Launchable: 43 // mojom::Launchable:
48 void Launch(uint32_t what, mojom::LaunchMode how) override; 44 void Launch(uint32_t what, mojom::LaunchMode how) override;
49 45
50 // service_manager::InterfaceFactory<mojom::Launchable>: 46 // service_manager::InterfaceFactory<mojom::Launchable>:
51 void Create(const service_manager::Identity& remote_identity, 47 void Create(const service_manager::Identity& remote_identity,
52 mojom::LaunchableRequest request) override; 48 mojom::LaunchableRequest request) override;
53 49
54 service_manager::ServiceContext* context_ = nullptr;
55
56 mojo::BindingSet<mojom::Launchable> bindings_; 50 mojo::BindingSet<mojom::Launchable> bindings_;
57 std::vector<views::Widget*> windows_; 51 std::vector<views::Widget*> windows_;
58 52
59 tracing::Provider tracing_; 53 tracing::Provider tracing_;
60 std::unique_ptr<views::AuraInit> aura_init_; 54 std::unique_ptr<views::AuraInit> aura_init_;
61 std::unique_ptr<views::WindowManagerConnection> window_manager_connection_; 55 std::unique_ptr<views::WindowManagerConnection> window_manager_connection_;
62 56
63 DISALLOW_COPY_AND_ASSIGN(TaskViewer); 57 DISALLOW_COPY_AND_ASSIGN(TaskViewer);
64 }; 58 };
65 59
66 } // namespace task_viewer 60 } // namespace task_viewer
67 } // namespace mash 61 } // namespace mash
68 62
69 #endif // MASH_TASK_VIEWER_TASK_VIEWER_H_ 63 #endif // MASH_TASK_VIEWER_TASK_VIEWER_H_
OLDNEW
« no previous file with comments | « mash/session/session.cc ('k') | mash/task_viewer/task_viewer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698