OLD | NEW |
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/service.h" | 15 #include "services/service_manager/public/cpp/service.h" |
16 #include "services/tracing/public/cpp/provider.h" | 16 #include "services/tracing/public/cpp/provider.h" |
17 | 17 |
18 namespace views { | 18 namespace views { |
19 class AuraInit; | 19 class AuraInit; |
20 class Widget; | 20 class Widget; |
21 class WindowManagerConnection; | 21 class WindowManagerConnection; |
22 } | 22 } |
23 | 23 |
24 namespace mash { | 24 namespace mash { |
25 namespace catalog_viewer { | 25 namespace catalog_viewer { |
26 | 26 |
27 class CatalogViewer : public shell::Service, | 27 class CatalogViewer |
28 public mojom::Launchable, | 28 : public service_manager::Service, |
29 public shell::InterfaceFactory<mojom::Launchable> { | 29 public mojom::Launchable, |
| 30 public service_manager::InterfaceFactory<mojom::Launchable> { |
30 public: | 31 public: |
31 CatalogViewer(); | 32 CatalogViewer(); |
32 ~CatalogViewer() override; | 33 ~CatalogViewer() override; |
33 | 34 |
34 void RemoveWindow(views::Widget* window); | 35 void RemoveWindow(views::Widget* window); |
35 | 36 |
36 private: | 37 private: |
37 // shell::Service: | 38 // service_manager::Service: |
38 void OnStart(const shell::Identity& identity) override; | 39 void OnStart(const service_manager::Identity& identity) override; |
39 bool OnConnect(const shell::Identity& remote_identity, | 40 bool OnConnect(const service_manager::Identity& remote_identity, |
40 shell::InterfaceRegistry* registry) override; | 41 service_manager::InterfaceRegistry* registry) override; |
41 | 42 |
42 // mojom::Launchable: | 43 // mojom::Launchable: |
43 void Launch(uint32_t what, mojom::LaunchMode how) override; | 44 void Launch(uint32_t what, mojom::LaunchMode how) override; |
44 | 45 |
45 // shell::InterfaceFactory<mojom::Launchable>: | 46 // service_manager::InterfaceFactory<mojom::Launchable>: |
46 void Create(const shell::Identity& remote_identity, | 47 void Create(const service_manager::Identity& remote_identity, |
47 mojom::LaunchableRequest request) override; | 48 mojom::LaunchableRequest request) override; |
48 | 49 |
49 mojo::BindingSet<mojom::Launchable> bindings_; | 50 mojo::BindingSet<mojom::Launchable> bindings_; |
50 std::vector<views::Widget*> windows_; | 51 std::vector<views::Widget*> windows_; |
51 | 52 |
52 tracing::Provider tracing_; | 53 tracing::Provider tracing_; |
53 std::unique_ptr<views::AuraInit> aura_init_; | 54 std::unique_ptr<views::AuraInit> aura_init_; |
54 std::unique_ptr<views::WindowManagerConnection> window_manager_connection_; | 55 std::unique_ptr<views::WindowManagerConnection> window_manager_connection_; |
55 | 56 |
56 DISALLOW_COPY_AND_ASSIGN(CatalogViewer); | 57 DISALLOW_COPY_AND_ASSIGN(CatalogViewer); |
57 }; | 58 }; |
58 | 59 |
59 } // namespace catalog_viewer | 60 } // namespace catalog_viewer |
60 } // namespace mash | 61 } // namespace mash |
61 | 62 |
62 #endif // MASH_CATALOG_VIEWER_CATALOG_VIEWER_H_ | 63 #endif // MASH_CATALOG_VIEWER_CATALOG_VIEWER_H_ |
OLD | NEW |