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

Side by Side Diff: mash/catalog_viewer/catalog_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/browser/browser.cc ('k') | mash/catalog_viewer/catalog_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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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_CATALOG_VIEWER_CATALOG_VIEWER_H_ 5 #ifndef MASH_CATALOG_VIEWER_CATALOG_VIEWER_H_
6 #define MASH_CATALOG_VIEWER_CATALOG_VIEWER_H_ 6 #define MASH_CATALOG_VIEWER_CATALOG_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 catalog_viewer { 26 namespace catalog_viewer {
31 27
32 class CatalogViewer 28 class CatalogViewer
33 : public service_manager::Service, 29 : public service_manager::Service,
34 public mojom::Launchable, 30 public mojom::Launchable,
35 public service_manager::InterfaceFactory<mojom::Launchable> { 31 public service_manager::InterfaceFactory<mojom::Launchable> {
36 public: 32 public:
37 CatalogViewer(); 33 CatalogViewer();
38 ~CatalogViewer() override; 34 ~CatalogViewer() override;
39 35
40 void RemoveWindow(views::Widget* window); 36 void RemoveWindow(views::Widget* window);
41 37
42 private: 38 private:
43 // service_manager::Service: 39 // service_manager::Service:
44 void OnStart(service_manager::ServiceContext* context) override; 40 void OnStart() override;
45 bool OnConnect(const service_manager::ServiceInfo& remote_info, 41 bool OnConnect(const service_manager::ServiceInfo& remote_info,
46 service_manager::InterfaceRegistry* registry) override; 42 service_manager::InterfaceRegistry* registry) override;
47 43
48 // mojom::Launchable: 44 // mojom::Launchable:
49 void Launch(uint32_t what, mojom::LaunchMode how) override; 45 void Launch(uint32_t what, mojom::LaunchMode how) override;
50 46
51 // service_manager::InterfaceFactory<mojom::Launchable>: 47 // service_manager::InterfaceFactory<mojom::Launchable>:
52 void Create(const service_manager::Identity& remote_identity, 48 void Create(const service_manager::Identity& remote_identity,
53 mojom::LaunchableRequest request) override; 49 mojom::LaunchableRequest request) override;
54 50
55 service_manager::ServiceContext* context_ = nullptr;
56
57 mojo::BindingSet<mojom::Launchable> bindings_; 51 mojo::BindingSet<mojom::Launchable> bindings_;
58 std::vector<views::Widget*> windows_; 52 std::vector<views::Widget*> windows_;
59 53
60 tracing::Provider tracing_; 54 tracing::Provider tracing_;
61 std::unique_ptr<views::AuraInit> aura_init_; 55 std::unique_ptr<views::AuraInit> aura_init_;
62 std::unique_ptr<views::WindowManagerConnection> window_manager_connection_; 56 std::unique_ptr<views::WindowManagerConnection> window_manager_connection_;
63 57
64 DISALLOW_COPY_AND_ASSIGN(CatalogViewer); 58 DISALLOW_COPY_AND_ASSIGN(CatalogViewer);
65 }; 59 };
66 60
67 } // namespace catalog_viewer 61 } // namespace catalog_viewer
68 } // namespace mash 62 } // namespace mash
69 63
70 #endif // MASH_CATALOG_VIEWER_CATALOG_VIEWER_H_ 64 #endif // MASH_CATALOG_VIEWER_CATALOG_VIEWER_H_
OLDNEW
« no previous file with comments | « mash/browser/browser.cc ('k') | mash/catalog_viewer/catalog_viewer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698