| Index: media/gpu/rendering_helper.cc
|
| diff --git a/media/gpu/rendering_helper.cc b/media/gpu/rendering_helper.cc
|
| index 9dc4940e2ea17bc0eb6cacc74fb3fd5fc86ba703..2ef0c3e6f250d88ab288acdf525b167a592cc59f 100644
|
| --- a/media/gpu/rendering_helper.cc
|
| +++ b/media/gpu/rendering_helper.cc
|
| @@ -86,23 +86,24 @@ void WaitForSwapAck(const base::Closure& callback, gfx::SwapResult result) {
|
|
|
| #if defined(USE_OZONE)
|
|
|
| -class DisplayConfiguratorObserver : public ui::DisplayConfigurator::Observer {
|
| +class DisplayConfiguratorObserver
|
| + : public display::DisplayConfigurator::Observer {
|
| public:
|
| explicit DisplayConfiguratorObserver(base::RunLoop* loop) : loop_(loop) {}
|
| ~DisplayConfiguratorObserver() override {}
|
|
|
| private:
|
| - // ui::DisplayConfigurator::Observer overrides:
|
| + // display::DisplayConfigurator::Observer overrides:
|
| void OnDisplayModeChanged(
|
| - const ui::DisplayConfigurator::DisplayStateList& outputs) override {
|
| + const display::DisplayConfigurator::DisplayStateList& outputs) override {
|
| if (!loop_)
|
| return;
|
| loop_->Quit();
|
| loop_ = nullptr;
|
| }
|
| void OnDisplayModeChangeFailed(
|
| - const ui::DisplayConfigurator::DisplayStateList& outputs,
|
| - ui::MultipleDisplayState failed_new_state) override {
|
| + const display::DisplayConfigurator::DisplayStateList& outputs,
|
| + display::MultipleDisplayState failed_new_state) override {
|
| LOG(FATAL) << "Could not configure display";
|
| }
|
|
|
| @@ -257,7 +258,7 @@ void RenderingHelper::Setup() {
|
| // the same size.
|
| base::RunLoop wait_display_setup;
|
| DisplayConfiguratorObserver display_setup_observer(&wait_display_setup);
|
| - display_configurator_.reset(new ui::DisplayConfigurator());
|
| + display_configurator_.reset(new display::DisplayConfigurator());
|
| display_configurator_->SetDelegateForTesting(0);
|
| display_configurator_->AddObserver(&display_setup_observer);
|
| display_configurator_->Init(
|
|
|