| Index: ash/display/display_animator_chromeos.h
|
| diff --git a/ash/display/display_animator_chromeos.h b/ash/display/display_animator_chromeos.h
|
| index 097aa80999b8963c946f347008aacb3244fdf1a5..333d03d6565547676a49afef9668343aa5c3b9c4 100644
|
| --- a/ash/display/display_animator_chromeos.h
|
| +++ b/ash/display/display_animator_chromeos.h
|
| @@ -27,11 +27,11 @@ class Layer;
|
| namespace ash {
|
|
|
| // DisplayAnimatorChromeOS provides the visual effects for
|
| -// ui::DisplayConfigurator, such like fade-out/in during changing
|
| +// display::DisplayConfigurator, such like fade-out/in during changing
|
| // the display mode.
|
| class ASH_EXPORT DisplayAnimatorChromeOS
|
| : public DisplayAnimator,
|
| - public ui::DisplayConfigurator::Observer {
|
| + public display::DisplayConfigurator::Observer {
|
| public:
|
| DisplayAnimatorChromeOS();
|
| ~DisplayAnimatorChromeOS() override;
|
| @@ -41,12 +41,12 @@ class ASH_EXPORT DisplayAnimatorChromeOS
|
| void StartFadeInAnimation() override;
|
|
|
| protected:
|
| - // ui::DisplayConfigurator::Observer overrides:
|
| + // display::DisplayConfigurator::Observer overrides:
|
| void OnDisplayModeChanged(
|
| - const ui::DisplayConfigurator::DisplayStateList& outputs) override;
|
| + const display::DisplayConfigurator::DisplayStateList& outputs) override;
|
| void OnDisplayModeChangeFailed(
|
| - const ui::DisplayConfigurator::DisplayStateList& displays,
|
| - ui::MultipleDisplayState failed_new_state) override;
|
| + const display::DisplayConfigurator::DisplayStateList& displays,
|
| + display::MultipleDisplayState failed_new_state) override;
|
|
|
| private:
|
| // Clears all hiding layers. Note that in case that this method is called
|
|
|