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

Side by Side Diff: mash/example/views_examples/views_examples.cc

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/catalog_viewer/catalog_viewer.h ('k') | mash/login/login.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 #include <memory> 5 #include <memory>
6 6
7 #include "base/macros.h" 7 #include "base/macros.h"
8 #include "mash/public/interfaces/launchable.mojom.h" 8 #include "mash/public/interfaces/launchable.mojom.h"
9 #include "mojo/public/cpp/bindings/binding_set.h" 9 #include "mojo/public/cpp/bindings/binding_set.h"
10 #include "services/shell/public/c/main.h" 10 #include "services/shell/public/c/main.h"
11 #include "services/shell/public/cpp/connection.h" 11 #include "services/shell/public/cpp/connection.h"
12 #include "services/shell/public/cpp/connector.h" 12 #include "services/shell/public/cpp/connector.h"
13 #include "services/shell/public/cpp/service.h" 13 #include "services/shell/public/cpp/service.h"
14 #include "services/shell/public/cpp/service_runner.h" 14 #include "services/shell/public/cpp/service_runner.h"
15 #include "services/tracing/public/cpp/tracing_impl.h" 15 #include "services/tracing/public/cpp/provider.h"
16 #include "ui/views/examples/example_base.h" 16 #include "ui/views/examples/example_base.h"
17 #include "ui/views/examples/examples_window.h" 17 #include "ui/views/examples/examples_window.h"
18 #include "ui/views/mus/aura_init.h" 18 #include "ui/views/mus/aura_init.h"
19 #include "ui/views/mus/window_manager_connection.h" 19 #include "ui/views/mus/window_manager_connection.h"
20 20
21 namespace views { 21 namespace views {
22 class AuraInit; 22 class AuraInit;
23 class WindowManagerConnection; 23 class WindowManagerConnection;
24 } 24 }
25 25
(...skipping 26 matching lines...) Expand all
52 } 52 }
53 53
54 // shell::InterfaceFactory<mash::mojom::Launchable>: 54 // shell::InterfaceFactory<mash::mojom::Launchable>:
55 void Create(const shell::Identity& remote_identity, 55 void Create(const shell::Identity& remote_identity,
56 mash::mojom::LaunchableRequest request) override { 56 mash::mojom::LaunchableRequest request) override {
57 bindings_.AddBinding(this, std::move(request)); 57 bindings_.AddBinding(this, std::move(request));
58 } 58 }
59 59
60 mojo::BindingSet<mash::mojom::Launchable> bindings_; 60 mojo::BindingSet<mash::mojom::Launchable> bindings_;
61 61
62 mojo::TracingImpl tracing_; 62 tracing::Provider tracing_;
63 std::unique_ptr<views::AuraInit> aura_init_; 63 std::unique_ptr<views::AuraInit> aura_init_;
64 std::unique_ptr<views::WindowManagerConnection> window_manager_connection_; 64 std::unique_ptr<views::WindowManagerConnection> window_manager_connection_;
65 65
66 DISALLOW_COPY_AND_ASSIGN(ViewsExamples); 66 DISALLOW_COPY_AND_ASSIGN(ViewsExamples);
67 }; 67 };
68 68
69 MojoResult ServiceMain(MojoHandle service_request_handle) { 69 MojoResult ServiceMain(MojoHandle service_request_handle) {
70 return shell::ServiceRunner(new ViewsExamples).Run(service_request_handle); 70 return shell::ServiceRunner(new ViewsExamples).Run(service_request_handle);
71 } 71 }
OLDNEW
« no previous file with comments | « mash/catalog_viewer/catalog_viewer.h ('k') | mash/login/login.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698