OLD | NEW |
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/binder_registry.h" | 15 #include "services/service_manager/public/cpp/binder_registry.h" |
16 #include "services/service_manager/public/cpp/interface_factory.h" | 16 #include "services/service_manager/public/cpp/interface_factory.h" |
17 #include "services/service_manager/public/cpp/service.h" | 17 #include "services/service_manager/public/cpp/service.h" |
18 #include "services/tracing/public/cpp/provider.h" | |
19 | 18 |
20 namespace views { | 19 namespace views { |
21 class AuraInit; | 20 class AuraInit; |
22 class Widget; | 21 class Widget; |
23 } | 22 } |
24 | 23 |
25 namespace mash { | 24 namespace mash { |
26 namespace task_viewer { | 25 namespace task_viewer { |
27 | 26 |
28 class TaskViewer | 27 class TaskViewer |
(...skipping 18 matching lines...) Expand all Loading... |
47 | 46 |
48 // service_manager::InterfaceFactory<::mash::mojom::Launchable>: | 47 // service_manager::InterfaceFactory<::mash::mojom::Launchable>: |
49 void Create(const service_manager::Identity& remote_identity, | 48 void Create(const service_manager::Identity& remote_identity, |
50 ::mash::mojom::LaunchableRequest request) override; | 49 ::mash::mojom::LaunchableRequest request) override; |
51 | 50 |
52 mojo::BindingSet<::mash::mojom::Launchable> bindings_; | 51 mojo::BindingSet<::mash::mojom::Launchable> bindings_; |
53 std::vector<views::Widget*> windows_; | 52 std::vector<views::Widget*> windows_; |
54 | 53 |
55 service_manager::BinderRegistry registry_; | 54 service_manager::BinderRegistry registry_; |
56 | 55 |
57 tracing::Provider tracing_; | |
58 std::unique_ptr<views::AuraInit> aura_init_; | 56 std::unique_ptr<views::AuraInit> aura_init_; |
59 | 57 |
60 DISALLOW_COPY_AND_ASSIGN(TaskViewer); | 58 DISALLOW_COPY_AND_ASSIGN(TaskViewer); |
61 }; | 59 }; |
62 | 60 |
63 } // namespace task_viewer | 61 } // namespace task_viewer |
64 } // namespace mash | 62 } // namespace mash |
65 | 63 |
66 #endif // MASH_TASK_VIEWER_TASK_VIEWER_H_ | 64 #endif // MASH_TASK_VIEWER_TASK_VIEWER_H_ |
OLD | NEW |