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

Side by Side Diff: services/tracing/main.cc

Issue 1058163002: Replaces |shell_handle| with |application_request| as the name of the parameter to MojoMain(). (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 8 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 | « services/test_service/test_service_application.cc ('k') | services/view_manager/main.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "base/bind.h" 5 #include "base/bind.h"
6 #include "base/memory/scoped_vector.h" 6 #include "base/memory/scoped_vector.h"
7 #include "mojo/application/application_runner_chromium.h" 7 #include "mojo/application/application_runner_chromium.h"
8 #include "mojo/common/weak_binding_set.h" 8 #include "mojo/common/weak_binding_set.h"
9 #include "mojo/common/weak_interface_ptr_set.h" 9 #include "mojo/common/weak_interface_ptr_set.h"
10 #include "mojo/public/c/system/main.h" 10 #include "mojo/public/c/system/main.h"
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 scoped_ptr<TraceDataSink> sink_; 103 scoped_ptr<TraceDataSink> sink_;
104 ScopedVector<CollectorImpl> collector_impls_; 104 ScopedVector<CollectorImpl> collector_impls_;
105 mojo::WeakInterfacePtrSet<TraceController> controller_ptrs_; 105 mojo::WeakInterfacePtrSet<TraceController> controller_ptrs_;
106 mojo::WeakBindingSet<TraceCoordinator> coordinator_bindings_; 106 mojo::WeakBindingSet<TraceCoordinator> coordinator_bindings_;
107 107
108 DISALLOW_COPY_AND_ASSIGN(TracingApp); 108 DISALLOW_COPY_AND_ASSIGN(TracingApp);
109 }; 109 };
110 110
111 } // namespace tracing 111 } // namespace tracing
112 112
113 MojoResult MojoMain(MojoHandle shell_handle) { 113 MojoResult MojoMain(MojoHandle application_request) {
114 mojo::ApplicationRunnerChromium runner(new tracing::TracingApp); 114 mojo::ApplicationRunnerChromium runner(new tracing::TracingApp);
115 return runner.Run(shell_handle); 115 return runner.Run(application_request);
116 } 116 }
OLDNEW
« no previous file with comments | « services/test_service/test_service_application.cc ('k') | services/view_manager/main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698