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 "services/ui/ws/window_tree_host_factory.h" | 5 #include "services/ui/ws/window_tree_host_factory.h" |
6 | 6 |
| 7 #include "services/ui/display/viewport_metrics.h" |
7 #include "services/ui/ws/display.h" | 8 #include "services/ui/ws/display.h" |
8 #include "services/ui/ws/display_binding.h" | 9 #include "services/ui/ws/display_binding.h" |
9 #include "services/ui/ws/window_server.h" | 10 #include "services/ui/ws/window_server.h" |
10 | 11 |
11 namespace ui { | 12 namespace ui { |
12 namespace ws { | 13 namespace ws { |
13 | 14 |
14 WindowTreeHostFactory::WindowTreeHostFactory(WindowServer* window_server, | 15 WindowTreeHostFactory::WindowTreeHostFactory(WindowServer* window_server, |
15 const UserId& user_id) | 16 const UserId& user_id) |
16 : window_server_(window_server), user_id_(user_id) { | 17 : window_server_(window_server), user_id_(user_id) {} |
17 platform_display_init_params_.metrics.bounds.set_width(1024); | |
18 platform_display_init_params_.metrics.bounds.set_height(768); | |
19 platform_display_init_params_.metrics.pixel_size.SetSize(1024, 768); | |
20 platform_display_init_params_.metrics.device_scale_factor = 1.0f; | |
21 } | |
22 | 18 |
23 WindowTreeHostFactory::~WindowTreeHostFactory() {} | 19 WindowTreeHostFactory::~WindowTreeHostFactory() {} |
24 | 20 |
25 void WindowTreeHostFactory::AddBinding( | 21 void WindowTreeHostFactory::AddBinding( |
26 mojom::WindowTreeHostFactoryRequest request) { | 22 mojom::WindowTreeHostFactoryRequest request) { |
27 bindings_.AddBinding(this, std::move(request)); | 23 bindings_.AddBinding(this, std::move(request)); |
28 } | 24 } |
29 | 25 |
30 void WindowTreeHostFactory::CreateWindowTreeHost( | 26 void WindowTreeHostFactory::CreateWindowTreeHost( |
31 mojom::WindowTreeHostRequest host, | 27 mojom::WindowTreeHostRequest host, |
32 mojom::WindowTreeClientPtr tree_client) { | 28 mojom::WindowTreeClientPtr tree_client) { |
33 Display* display = new Display(window_server_); | 29 Display* ws_display = new Display(window_server_); |
| 30 |
34 std::unique_ptr<DisplayBindingImpl> display_binding( | 31 std::unique_ptr<DisplayBindingImpl> display_binding( |
35 new DisplayBindingImpl(std::move(host), display, user_id_, | 32 new DisplayBindingImpl(std::move(host), ws_display, user_id_, |
36 std::move(tree_client), window_server_)); | 33 std::move(tree_client), window_server_)); |
37 display->Init(platform_display_init_params_, std::move(display_binding)); | 34 |
| 35 // Provide an initial size for the WindowTreeHost. |
| 36 display::ViewportMetrics metrics; |
| 37 metrics.bounds = gfx::Rect(1024, 768); |
| 38 metrics.device_scale_factor = 1.0f; |
| 39 metrics.ui_scale_factor = 1.0f; |
| 40 |
| 41 display::Display display(1, metrics.bounds); |
| 42 ws_display->SetDisplay(display); |
| 43 |
| 44 ws_display->Init(metrics, std::move(display_binding)); |
38 } | 45 } |
39 | 46 |
40 } // namespace ws | 47 } // namespace ws |
41 } // namespace ui | 48 } // namespace ui |
OLD | NEW |