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

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

Issue 2208783002: Make Tracing Service not use outgoing InterfaceProvider, update conventions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 4 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/screenlock/screenlock.h ('k') | mash/webtest/webtest.h » ('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/shell/public/cpp/service.h" 15 #include "services/shell/public/cpp/service.h"
16 #include "services/tracing/public/cpp/tracing_impl.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
(...skipping 14 matching lines...) Expand all
41 // mojom::Launchable: 41 // mojom::Launchable:
42 void Launch(uint32_t what, mojom::LaunchMode how) override; 42 void Launch(uint32_t what, mojom::LaunchMode how) override;
43 43
44 // shell::InterfaceFactory<mojom::Launchable>: 44 // shell::InterfaceFactory<mojom::Launchable>:
45 void Create(const shell::Identity& remote_identity, 45 void Create(const shell::Identity& remote_identity,
46 mojom::LaunchableRequest request) override; 46 mojom::LaunchableRequest request) override;
47 47
48 mojo::BindingSet<mojom::Launchable> bindings_; 48 mojo::BindingSet<mojom::Launchable> bindings_;
49 std::vector<views::Widget*> windows_; 49 std::vector<views::Widget*> windows_;
50 50
51 mojo::TracingImpl tracing_; 51 tracing::Provider tracing_;
52 std::unique_ptr<views::AuraInit> aura_init_; 52 std::unique_ptr<views::AuraInit> aura_init_;
53 std::unique_ptr<views::WindowManagerConnection> window_manager_connection_; 53 std::unique_ptr<views::WindowManagerConnection> window_manager_connection_;
54 54
55 DISALLOW_COPY_AND_ASSIGN(TaskViewer); 55 DISALLOW_COPY_AND_ASSIGN(TaskViewer);
56 }; 56 };
57 57
58 } // namespace task_viewer 58 } // namespace task_viewer
59 } // namespace mash 59 } // namespace mash
60 60
61 #endif // MASH_TASK_VIEWER_TASK_VIEWER_H_ 61 #endif // MASH_TASK_VIEWER_TASK_VIEWER_H_
OLDNEW
« no previous file with comments | « mash/screenlock/screenlock.h ('k') | mash/webtest/webtest.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698