| OLD | NEW |
| 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" |
| 11 #include "mojo/common/tracing_impl.h" | 11 #include "mojo/common/tracing_impl.h" |
| 12 #include "mojo/public/c/system/main.h" | 12 #include "mojo/public/c/system/main.h" |
| 13 #include "mojo/public/cpp/application/application_connection.h" | |
| 14 #include "mojo/public/cpp/application/application_impl.h" | 13 #include "mojo/public/cpp/application/application_impl.h" |
| 14 #include "mojo/public/cpp/application/service_provider_impl.h" |
| 15 #include "services/gfx/compositor/compositor_impl.h" | 15 #include "services/gfx/compositor/compositor_impl.h" |
| 16 | 16 |
| 17 namespace compositor { | 17 namespace compositor { |
| 18 | 18 |
| 19 CompositorApp::CompositorApp() : app_impl_(nullptr) {} | 19 CompositorApp::CompositorApp() : app_impl_(nullptr) {} |
| 20 | 20 |
| 21 CompositorApp::~CompositorApp() {} | 21 CompositorApp::~CompositorApp() {} |
| 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; |
| (...skipping 15 matching lines...) Expand all Loading... |
| 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 |
| OLD | NEW |