| Index: services/gfx/compositor/compositor_app.cc
|
| diff --git a/services/gfx/compositor/compositor_app.cc b/services/gfx/compositor/compositor_app.cc
|
| index bd05c8af324ab4dc8c269084efc1e3f63f96a021..7f52199a0e95fc349f18b2d478ecdc0236fe1930 100644
|
| --- a/services/gfx/compositor/compositor_app.cc
|
| +++ b/services/gfx/compositor/compositor_app.cc
|
| @@ -16,25 +16,23 @@
|
|
|
| namespace compositor {
|
|
|
| -CompositorApp::CompositorApp() : app_impl_(nullptr) {}
|
| +CompositorApp::CompositorApp() {}
|
|
|
| CompositorApp::~CompositorApp() {}
|
|
|
| -void CompositorApp::Initialize(mojo::ApplicationImpl* app_impl) {
|
| - app_impl_ = app_impl;
|
| -
|
| +void CompositorApp::OnInitialize() {
|
| auto command_line = base::CommandLine::ForCurrentProcess();
|
| - command_line->InitFromArgv(app_impl_->args());
|
| + command_line->InitFromArgv(args());
|
| logging::LoggingSettings settings;
|
| settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG;
|
| logging::InitLogging(settings);
|
|
|
| - tracing_.Initialize(app_impl_->shell(), &app_impl_->args());
|
| + tracing_.Initialize(shell(), &args());
|
|
|
| engine_.reset(new CompositorEngine());
|
| }
|
|
|
| -bool CompositorApp::ConfigureIncomingConnection(
|
| +bool CompositorApp::OnAcceptConnection(
|
| mojo::ServiceProviderImpl* service_provider_impl) {
|
| service_provider_impl->AddService<mojo::gfx::composition::Compositor>(
|
| [this](const mojo::ConnectionContext& connection_context,
|
|
|