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

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

Issue 2420253002: Rename shell namespace to service_manager (Closed)
Patch Set: . Created 4 years, 2 months 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/main.cc ('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/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 task_viewer { 25 namespace task_viewer {
26 26
27 class TaskViewer : public shell::Service, 27 class TaskViewer : public service_manager::Service,
28 public mojom::Launchable, 28 public mojom::Launchable,
29 public shell::InterfaceFactory<mojom::Launchable> { 29 public service_manager::InterfaceFactory<mojom::Launchable> {
30 public: 30 public:
31 TaskViewer(); 31 TaskViewer();
32 ~TaskViewer() override; 32 ~TaskViewer() override;
33 33
34 void RemoveWindow(views::Widget* widget); 34 void RemoveWindow(views::Widget* widget);
35 35
36 private: 36 private:
37 // shell::Service: 37 // service_manager::Service:
38 void OnStart(const shell::Identity& identity) override; 38 void OnStart(const service_manager::Identity& identity) override;
39 bool OnConnect(const shell::Identity& remote_identity, 39 bool OnConnect(const service_manager::Identity& remote_identity,
40 shell::InterfaceRegistry* registry) override; 40 service_manager::InterfaceRegistry* registry) override;
41 41
42 // mojom::Launchable: 42 // mojom::Launchable:
43 void Launch(uint32_t what, mojom::LaunchMode how) override; 43 void Launch(uint32_t what, mojom::LaunchMode how) override;
44 44
45 // shell::InterfaceFactory<mojom::Launchable>: 45 // service_manager::InterfaceFactory<mojom::Launchable>:
46 void Create(const shell::Identity& remote_identity, 46 void Create(const service_manager::Identity& remote_identity,
47 mojom::LaunchableRequest request) override; 47 mojom::LaunchableRequest request) override;
48 48
49 mojo::BindingSet<mojom::Launchable> bindings_; 49 mojo::BindingSet<mojom::Launchable> bindings_;
50 std::vector<views::Widget*> windows_; 50 std::vector<views::Widget*> windows_;
51 51
52 tracing::Provider tracing_; 52 tracing::Provider tracing_;
53 std::unique_ptr<views::AuraInit> aura_init_; 53 std::unique_ptr<views::AuraInit> aura_init_;
54 std::unique_ptr<views::WindowManagerConnection> window_manager_connection_; 54 std::unique_ptr<views::WindowManagerConnection> window_manager_connection_;
55 55
56 DISALLOW_COPY_AND_ASSIGN(TaskViewer); 56 DISALLOW_COPY_AND_ASSIGN(TaskViewer);
57 }; 57 };
58 58
59 } // namespace task_viewer 59 } // namespace task_viewer
60 } // namespace mash 60 } // namespace mash
61 61
62 #endif // MASH_TASK_VIEWER_TASK_VIEWER_H_ 62 #endif // MASH_TASK_VIEWER_TASK_VIEWER_H_
OLDNEW
« no previous file with comments | « mash/task_viewer/main.cc ('k') | mash/task_viewer/task_viewer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698