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/display/platform_screen_ozone.h" | 5 #include "services/ui/display/platform_screen_ozone.h" |
6 | 6 |
7 #include <memory> | 7 #include <memory> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
73 delegate_ = delegate; | 73 delegate_ = delegate; |
74 | 74 |
75 std::unique_ptr<ui::NativeDisplayDelegate> native_display_delegate = | 75 std::unique_ptr<ui::NativeDisplayDelegate> native_display_delegate = |
76 ui::OzonePlatform::GetInstance()->CreateNativeDisplayDelegate(); | 76 ui::OzonePlatform::GetInstance()->CreateNativeDisplayDelegate(); |
77 | 77 |
78 // The FakeDisplayController gives us a way to make the NativeDisplayDelegate | 78 // The FakeDisplayController gives us a way to make the NativeDisplayDelegate |
79 // pretend something display related has happened. | 79 // pretend something display related has happened. |
80 if (!base::SysInfo::IsRunningOnChromeOS()) { | 80 if (!base::SysInfo::IsRunningOnChromeOS()) { |
81 fake_display_controller_ = | 81 fake_display_controller_ = |
82 native_display_delegate->GetFakeDisplayController(); | 82 native_display_delegate->GetFakeDisplayController(); |
83 // Don't set up a default display on non-ChromeOS. | |
rjkroege
2016/11/18 22:47:14
I think that this will break the oxygen build of C
| |
84 return; | |
83 } | 85 } |
84 | 86 |
85 // We want display configuration to happen even off device to keep the control | 87 // We want display configuration to happen even off device to keep the control |
86 // flow similar. | 88 // flow similar. |
87 display_configurator_.set_configure_display(true); | 89 display_configurator_.set_configure_display(true); |
88 display_configurator_.AddObserver(this); | 90 display_configurator_.AddObserver(this); |
89 display_configurator_.set_state_controller(this); | 91 display_configurator_.set_state_controller(this); |
90 display_configurator_.Init(std::move(native_display_delegate), false); | 92 display_configurator_.Init(std::move(native_display_delegate), false); |
91 display_configurator_.ForceInitialConfigure(kChromeOsBootColor); | 93 display_configurator_.ForceInitialConfigure(kChromeOsBootColor); |
92 } | 94 } |
(...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
376 return false; | 378 return false; |
377 } | 379 } |
378 | 380 |
379 void PlatformScreenOzone::Create( | 381 void PlatformScreenOzone::Create( |
380 const service_manager::Identity& remote_identity, | 382 const service_manager::Identity& remote_identity, |
381 mojom::TestDisplayControllerRequest request) { | 383 mojom::TestDisplayControllerRequest request) { |
382 test_bindings_.AddBinding(this, std::move(request)); | 384 test_bindings_.AddBinding(this, std::move(request)); |
383 } | 385 } |
384 | 386 |
385 } // namespace display | 387 } // namespace display |
OLD | NEW |