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

Side by Side Diff: mash/quick_launch/quick_launch.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/login/login.cc ('k') | mash/quick_launch/quick_launch.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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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_QUICK_LAUNCH_QUICK_LAUNCH_H_ 5 #ifndef MASH_QUICK_LAUNCH_QUICK_LAUNCH_H_
6 #define MASH_QUICK_LAUNCH_QUICK_LAUNCH_H_ 6 #define MASH_QUICK_LAUNCH_QUICK_LAUNCH_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "mash/public/interfaces/launchable.mojom.h" 11 #include "mash/public/interfaces/launchable.mojom.h"
12 #include "mojo/public/cpp/bindings/binding_set.h" 12 #include "mojo/public/cpp/bindings/binding_set.h"
13 #include "services/shell/public/cpp/service.h" 13 #include "services/shell/public/cpp/service.h"
14 #include "services/tracing/public/cpp/tracing_impl.h" 14 #include "services/tracing/public/cpp/provider.h"
15 15
16 namespace views { 16 namespace views {
17 class AuraInit; 17 class AuraInit;
18 class Widget; 18 class Widget;
19 class WindowManagerConnection; 19 class WindowManagerConnection;
20 } 20 }
21 21
22 namespace mash { 22 namespace mash {
23 namespace quick_launch { 23 namespace quick_launch {
24 24
(...skipping 14 matching lines...) Expand all
39 // mojom::Launchable: 39 // mojom::Launchable:
40 void Launch(uint32_t what, mojom::LaunchMode how) override; 40 void Launch(uint32_t what, mojom::LaunchMode how) override;
41 41
42 // shell::InterfaceFactory<mojom::Launchable>: 42 // shell::InterfaceFactory<mojom::Launchable>:
43 void Create(const shell::Identity& remote_identity, 43 void Create(const shell::Identity& remote_identity,
44 mojom::LaunchableRequest request) override; 44 mojom::LaunchableRequest request) override;
45 45
46 mojo::BindingSet<mojom::Launchable> bindings_; 46 mojo::BindingSet<mojom::Launchable> bindings_;
47 std::vector<views::Widget*> windows_; 47 std::vector<views::Widget*> windows_;
48 48
49 mojo::TracingImpl tracing_; 49 tracing::Provider tracing_;
50 std::unique_ptr<views::AuraInit> aura_init_; 50 std::unique_ptr<views::AuraInit> aura_init_;
51 std::unique_ptr<views::WindowManagerConnection> window_manager_connection_; 51 std::unique_ptr<views::WindowManagerConnection> window_manager_connection_;
52 52
53 DISALLOW_COPY_AND_ASSIGN(QuickLaunch); 53 DISALLOW_COPY_AND_ASSIGN(QuickLaunch);
54 }; 54 };
55 55
56 } // namespace quick_launch 56 } // namespace quick_launch
57 } // namespace mash 57 } // namespace mash
58 58
59 #endif // MASH_QUICK_LAUNCH_QUICK_LAUNCH_H_ 59 #endif // MASH_QUICK_LAUNCH_QUICK_LAUNCH_H_
OLDNEW
« no previous file with comments | « mash/login/login.cc ('k') | mash/quick_launch/quick_launch.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698