| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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/ws/window_tree_host_factory.h" | 5 #include "components/mus/ws/window_tree_host_factory.h" |
| 6 | 6 |
| 7 #include "components/mus/gles2/gpu_state.h" | 7 #include "components/mus/gles2/gpu_state.h" |
| 8 #include "components/mus/surfaces/surfaces_state.h" | 8 #include "components/mus/surfaces/surfaces_state.h" |
| 9 #include "components/mus/ws/display.h" | 9 #include "components/mus/ws/display.h" |
| 10 #include "components/mus/ws/display_binding.h" | 10 #include "components/mus/ws/display_binding.h" |
| (...skipping 14 matching lines...) Expand all Loading... |
| 25 | 25 |
| 26 void WindowTreeHostFactory::AddBinding( | 26 void WindowTreeHostFactory::AddBinding( |
| 27 mojom::WindowTreeHostFactoryRequest request) { | 27 mojom::WindowTreeHostFactoryRequest request) { |
| 28 bindings_.AddBinding(this, std::move(request)); | 28 bindings_.AddBinding(this, std::move(request)); |
| 29 } | 29 } |
| 30 | 30 |
| 31 void WindowTreeHostFactory::CreateWindowTreeHost( | 31 void WindowTreeHostFactory::CreateWindowTreeHost( |
| 32 mojom::WindowTreeHostRequest host, | 32 mojom::WindowTreeHostRequest host, |
| 33 mojom::WindowTreeClientPtr tree_client) { | 33 mojom::WindowTreeClientPtr tree_client) { |
| 34 Display* display = new Display(window_server_, platform_display_init_params_); | 34 Display* display = new Display(window_server_, platform_display_init_params_); |
| 35 scoped_ptr<DisplayBindingImpl> display_binding( | 35 std::unique_ptr<DisplayBindingImpl> display_binding( |
| 36 new DisplayBindingImpl(std::move(host), display, user_id_, | 36 new DisplayBindingImpl(std::move(host), display, user_id_, |
| 37 std::move(tree_client), window_server_)); | 37 std::move(tree_client), window_server_)); |
| 38 display->Init(std::move(display_binding)); | 38 display->Init(std::move(display_binding)); |
| 39 } | 39 } |
| 40 | 40 |
| 41 } // namespace ws | 41 } // namespace ws |
| 42 } // namespace mus | 42 } // namespace mus |
| OLD | NEW |