| OLD | NEW |
| 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 "components/mus/mus_app.h" | 5 #include "components/mus/mus_app.h" |
| 6 | 6 |
| 7 #include "base/stl_util.h" | 7 #include "base/stl_util.h" |
| 8 #include "components/mus/common/args.h" | 8 #include "components/mus/common/args.h" |
| 9 #include "components/mus/gles2/gpu_impl.h" | 9 #include "components/mus/gles2/gpu_impl.h" |
| 10 #include "components/mus/surfaces/surfaces_scheduler.h" | 10 #include "components/mus/surfaces/surfaces_scheduler.h" |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 63 #if !defined(OS_ANDROID) | 63 #if !defined(OS_ANDROID) |
| 64 hardware_rendering_available = gfx::GLSurface::InitializeOneOff(); | 64 hardware_rendering_available = gfx::GLSurface::InitializeOneOff(); |
| 65 event_source_ = ui::PlatformEventSource::CreateDefault(); | 65 event_source_ = ui::PlatformEventSource::CreateDefault(); |
| 66 #endif | 66 #endif |
| 67 | 67 |
| 68 // TODO(rjkroege): It is possible that we might want to generalize the | 68 // TODO(rjkroege): It is possible that we might want to generalize the |
| 69 // GpuState object. | 69 // GpuState object. |
| 70 if (!gpu_state_.get()) | 70 if (!gpu_state_.get()) |
| 71 gpu_state_ = new GpuState(hardware_rendering_available); | 71 gpu_state_ = new GpuState(hardware_rendering_available); |
| 72 connection_manager_.reset(new ws::ConnectionManager(this, surfaces_state_)); | 72 connection_manager_.reset(new ws::ConnectionManager(this, surfaces_state_)); |
| 73 |
| 74 tracing_.Initialize(app); |
| 73 } | 75 } |
| 74 | 76 |
| 75 bool MandolineUIServicesApp::ConfigureIncomingConnection( | 77 bool MandolineUIServicesApp::ConfigureIncomingConnection( |
| 76 ApplicationConnection* connection) { | 78 ApplicationConnection* connection) { |
| 77 connection->AddService<Gpu>(this); | 79 connection->AddService<Gpu>(this); |
| 78 connection->AddService<mojom::WindowManager>(this); | 80 connection->AddService<mojom::WindowManager>(this); |
| 79 connection->AddService<WindowTreeHostFactory>(this); | 81 connection->AddService<WindowTreeHostFactory>(this); |
| 80 return true; | 82 return true; |
| 81 } | 83 } |
| 82 | 84 |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 146 host_client.Pass(), connection_manager_.get(), app_impl_, gpu_state_, | 148 host_client.Pass(), connection_manager_.get(), app_impl_, gpu_state_, |
| 147 surfaces_state_, window_manager.Pass()); | 149 surfaces_state_, window_manager.Pass()); |
| 148 | 150 |
| 149 // WindowTreeHostConnection manages its own lifetime. | 151 // WindowTreeHostConnection manages its own lifetime. |
| 150 host_impl->Init(new ws::WindowTreeHostConnectionImpl( | 152 host_impl->Init(new ws::WindowTreeHostConnectionImpl( |
| 151 host.Pass(), make_scoped_ptr(host_impl), tree_client.Pass(), | 153 host.Pass(), make_scoped_ptr(host_impl), tree_client.Pass(), |
| 152 connection_manager_.get())); | 154 connection_manager_.get())); |
| 153 } | 155 } |
| 154 | 156 |
| 155 } // namespace mus | 157 } // namespace mus |
| OLD | NEW |