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

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

Issue 2569413003: Converts more services to use aura-mus (Closed)
Patch Set: merge Created 4 years 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/task_viewer/BUILD.gn ('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 views { 19 namespace views {
20 class AuraInit; 20 class AuraInit;
21 class Widget; 21 class Widget;
22 class WindowManagerConnection;
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
29 : public service_manager::Service, 28 : public service_manager::Service,
30 public ::mash::mojom::Launchable, 29 public ::mash::mojom::Launchable,
31 public service_manager::InterfaceFactory<::mash::mojom::Launchable> { 30 public service_manager::InterfaceFactory<::mash::mojom::Launchable> {
32 public: 31 public:
(...skipping 13 matching lines...) Expand all
46 45
47 // service_manager::InterfaceFactory<::mash::mojom::Launchable>: 46 // service_manager::InterfaceFactory<::mash::mojom::Launchable>:
48 void Create(const service_manager::Identity& remote_identity, 47 void Create(const service_manager::Identity& remote_identity,
49 ::mash::mojom::LaunchableRequest request) override; 48 ::mash::mojom::LaunchableRequest request) override;
50 49
51 mojo::BindingSet<::mash::mojom::Launchable> bindings_; 50 mojo::BindingSet<::mash::mojom::Launchable> bindings_;
52 std::vector<views::Widget*> windows_; 51 std::vector<views::Widget*> windows_;
53 52
54 tracing::Provider tracing_; 53 tracing::Provider tracing_;
55 std::unique_ptr<views::AuraInit> aura_init_; 54 std::unique_ptr<views::AuraInit> aura_init_;
56 std::unique_ptr<views::WindowManagerConnection> window_manager_connection_;
57 55
58 DISALLOW_COPY_AND_ASSIGN(TaskViewer); 56 DISALLOW_COPY_AND_ASSIGN(TaskViewer);
59 }; 57 };
60 58
61 } // namespace task_viewer 59 } // namespace task_viewer
62 } // namespace mash 60 } // namespace mash
63 61
64 #endif // MASH_TASK_VIEWER_TASK_VIEWER_H_ 62 #endif // MASH_TASK_VIEWER_TASK_VIEWER_H_
OLDNEW
« no previous file with comments | « mash/task_viewer/BUILD.gn ('k') | mash/task_viewer/task_viewer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698