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

Side by Side Diff: services/gfx/compositor/compositor_app.cc

Issue 2014043002: Make TracingImpl take a Shell* and args, instead of an ApplicationImpl*. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 4 years, 7 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/dart/dart_tracing.cc ('k') | services/java_handler/java_handler.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 #include "services/gfx/compositor/compositor_app.h" 5 #include "services/gfx/compositor/compositor_app.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/trace_event/trace_event.h" 9 #include "base/trace_event/trace_event.h"
10 #include "mojo/application/application_runner_chromium.h" 10 #include "mojo/application/application_runner_chromium.h"
(...skipping 11 matching lines...) Expand all
22 22
23 void CompositorApp::Initialize(mojo::ApplicationImpl* app_impl) { 23 void CompositorApp::Initialize(mojo::ApplicationImpl* app_impl) {
24 app_impl_ = app_impl; 24 app_impl_ = app_impl;
25 25
26 auto command_line = base::CommandLine::ForCurrentProcess(); 26 auto command_line = base::CommandLine::ForCurrentProcess();
27 command_line->InitFromArgv(app_impl_->args()); 27 command_line->InitFromArgv(app_impl_->args());
28 logging::LoggingSettings settings; 28 logging::LoggingSettings settings;
29 settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG; 29 settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG;
30 logging::InitLogging(settings); 30 logging::InitLogging(settings);
31 31
32 tracing_.Initialize(app_impl_); 32 tracing_.Initialize(app_impl_->shell(), &app_impl_->args());
33 33
34 engine_.reset(new CompositorEngine()); 34 engine_.reset(new CompositorEngine());
35 } 35 }
36 36
37 bool CompositorApp::ConfigureIncomingConnection( 37 bool CompositorApp::ConfigureIncomingConnection(
38 mojo::ServiceProviderImpl* service_provider_impl) { 38 mojo::ServiceProviderImpl* service_provider_impl) {
39 service_provider_impl->AddService<mojo::gfx::composition::Compositor>( 39 service_provider_impl->AddService<mojo::gfx::composition::Compositor>(
40 [this](const mojo::ConnectionContext& connection_context, 40 [this](const mojo::ConnectionContext& connection_context,
41 mojo::InterfaceRequest<mojo::gfx::composition::Compositor> 41 mojo::InterfaceRequest<mojo::gfx::composition::Compositor>
42 compositor_request) { 42 compositor_request) {
43 compositor_bindings_.AddBinding(new CompositorImpl(engine_.get()), 43 compositor_bindings_.AddBinding(new CompositorImpl(engine_.get()),
44 compositor_request.Pass()); 44 compositor_request.Pass());
45 }); 45 });
46 return true; 46 return true;
47 } 47 }
48 48
49 } // namespace compositor 49 } // namespace compositor
OLDNEW
« no previous file with comments | « services/dart/dart_tracing.cc ('k') | services/java_handler/java_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698