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