| Index: extensions/shell/browser/shell_desktop_controller_aura.h
|
| diff --git a/extensions/shell/browser/shell_desktop_controller_aura.h b/extensions/shell/browser/shell_desktop_controller_aura.h
|
| index c73faa22519d27b0713734db1a115200cb4dfc25..c55b4583d61623a8b2d756b1023f7742f8c0d316 100644
|
| --- a/extensions/shell/browser/shell_desktop_controller_aura.h
|
| +++ b/extensions/shell/browser/shell_desktop_controller_aura.h
|
| @@ -63,7 +63,7 @@ class ShellDesktopControllerAura
|
| public aura::client::WindowParentingClient,
|
| #if defined(OS_CHROMEOS)
|
| public chromeos::PowerManagerClient::Observer,
|
| - public ui::DisplayConfigurator::Observer,
|
| + public display::DisplayConfigurator::Observer,
|
| #endif
|
| public aura::WindowTreeHostObserver,
|
| public ui::internal::InputMethodDelegate {
|
| @@ -89,9 +89,9 @@ class ShellDesktopControllerAura
|
| void PowerButtonEventReceived(bool down,
|
| const base::TimeTicks& timestamp) override;
|
|
|
| - // ui::DisplayConfigurator::Observer overrides.
|
| + // display::DisplayConfigurator::Observer overrides.
|
| void OnDisplayModeChanged(
|
| - const ui::DisplayConfigurator::DisplayStateList& displays) override;
|
| + const display::DisplayConfigurator::DisplayStateList& displays) override;
|
| #endif
|
|
|
| // aura::WindowTreeHostObserver overrides:
|
| @@ -120,7 +120,7 @@ class ShellDesktopControllerAura
|
| gfx::Size GetPrimaryDisplaySize();
|
|
|
| #if defined(OS_CHROMEOS)
|
| - std::unique_ptr<ui::DisplayConfigurator> display_configurator_;
|
| + std::unique_ptr<display::DisplayConfigurator> display_configurator_;
|
| #endif
|
|
|
| std::unique_ptr<ShellScreen> screen_;
|
|
|