| Index: ash/display/display_configuration_controller.h
|
| diff --git a/ash/display/display_configuration_controller.h b/ash/display/display_configuration_controller.h
|
| index 1f121dfe3503b16be3663e2d130065f01dd50249..e67ee356c97f618170b13e6e41db20fdaf8fee1a 100644
|
| --- a/ash/display/display_configuration_controller.h
|
| +++ b/ash/display/display_configuration_controller.h
|
| @@ -9,7 +9,6 @@
|
|
|
| #include "ash/ash_export.h"
|
| #include "ash/display/window_tree_host_manager.h"
|
| -#include "ash/rotator/screen_rotation_animator_observer.h"
|
| #include "base/macros.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "ui/display/display.h"
|
| @@ -34,8 +33,7 @@ class ScreenRotationAnimator;
|
| // * Provides a single interface for UI and API classes.
|
| // * TODO: Forwards display configuration changed events to UI and API classes.
|
| class ASH_EXPORT DisplayConfigurationController
|
| - : public WindowTreeHostManager::Observer,
|
| - public ScreenRotationAnimatorObserver {
|
| + : public WindowTreeHostManager::Observer {
|
| public:
|
| DisplayConfigurationController(
|
| display::DisplayManager* display_manager,
|
| @@ -62,11 +60,6 @@ class ASH_EXPORT DisplayConfigurationController
|
| // WindowTreeHostManager::Observer
|
| void OnDisplayConfigurationChanged() override;
|
|
|
| - // ScreenRotationAnimatorObserver
|
| - // This will be called when the animation is ended or aborted.
|
| - void OnScreenRotationAnimationFinished(
|
| - ScreenRotationAnimator* animator) override;
|
| -
|
| protected:
|
| friend class ash::test::DisplayConfigurationControllerTestApi;
|
|
|
|
|