| 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 "services/ui/service.h" | 5 #include "services/ui/service.h" |
| 6 | 6 |
| 7 #include <set> | 7 #include <set> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 339 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 350 void Service::Create(const shell::Identity& remote_identity, | 350 void Service::Create(const shell::Identity& remote_identity, |
| 351 mojom::WindowServerTestRequest request) { | 351 mojom::WindowServerTestRequest request) { |
| 352 if (!test_config_) | 352 if (!test_config_) |
| 353 return; | 353 return; |
| 354 new ws::WindowServerTestImpl(window_server_.get(), std::move(request)); | 354 new ws::WindowServerTestImpl(window_server_.get(), std::move(request)); |
| 355 } | 355 } |
| 356 | 356 |
| 357 void Service::OnCreatedPhysicalDisplay(int64_t id, const gfx::Rect& bounds) { | 357 void Service::OnCreatedPhysicalDisplay(int64_t id, const gfx::Rect& bounds) { |
| 358 platform_display_init_params_.display_bounds = bounds; | 358 platform_display_init_params_.display_bounds = bounds; |
| 359 platform_display_init_params_.display_id = id; | 359 platform_display_init_params_.display_id = id; |
| 360 platform_display_init_params_.platform_screen = platform_screen_.get(); |
| 360 | 361 |
| 361 // Display manages its own lifetime. | 362 // Display manages its own lifetime. |
| 362 ws::Display* host_impl = | 363 ws::Display* host_impl = |
| 363 new ws::Display(window_server_.get(), platform_display_init_params_); | 364 new ws::Display(window_server_.get(), platform_display_init_params_); |
| 364 host_impl->Init(nullptr); | 365 host_impl->Init(nullptr); |
| 365 | 366 |
| 366 if (touch_controller_) | 367 if (touch_controller_) |
| 367 touch_controller_->UpdateTouchTransforms(); | 368 touch_controller_->UpdateTouchTransforms(); |
| 368 } | 369 } |
| 369 | 370 |
| 370 } // namespace ui | 371 } // namespace ui |
| OLD | NEW |