| Index: ash/display/display_animator_chromeos.h
|
| diff --git a/ash/display/display_animator.h b/ash/display/display_animator_chromeos.h
|
| similarity index 64%
|
| copy from ash/display/display_animator.h
|
| copy to ash/display/display_animator_chromeos.h
|
| index 81c60053d4aa92618f401c8d1b9f44be927b644b..a4fc768ff9ca32f659e54401c850e2756916e753 100644
|
| --- a/ash/display/display_animator.h
|
| +++ b/ash/display/display_animator_chromeos.h
|
| @@ -2,12 +2,13 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef ASH_DISPLAY_DISPLAY_ANIMATOR_H_
|
| -#define ASH_DISPLAY_DISPLAY_ANIMATOR_H_
|
| +#ifndef ASH_DISPLAY_DISPLAY_ANIMATOR_CHROMEOS_H_
|
| +#define ASH_DISPLAY_DISPLAY_ANIMATOR_CHROMEOS_H_
|
|
|
| #include <map>
|
|
|
| #include "ash/ash_export.h"
|
| +#include "ash/display/display_animator.h"
|
| #include "base/callback.h"
|
| #include "base/macros.h"
|
| #include "base/memory/weak_ptr.h"
|
| @@ -25,21 +26,19 @@ class Layer;
|
|
|
| namespace ash {
|
|
|
| -// DisplayAnimator provides the visual effects for
|
| +// DisplayAnimatorChromeOS provides the visual effects for
|
| // ui::DisplayConfigurator, such like fade-out/in during changing
|
| // the display mode.
|
| -class ASH_EXPORT DisplayAnimator : public ui::DisplayConfigurator::Observer {
|
| +class ASH_EXPORT DisplayAnimatorChromeOS
|
| + : public DisplayAnimator,
|
| + public ui::DisplayConfigurator::Observer {
|
| public:
|
| - DisplayAnimator();
|
| - ~DisplayAnimator() override;
|
| + DisplayAnimatorChromeOS();
|
| + ~DisplayAnimatorChromeOS() override;
|
|
|
| - // Starts the fade-out animation for the all root windows. It will
|
| - // call |callback| once all of the animations have finished.
|
| - void StartFadeOutAnimation(base::Closure callback);
|
| -
|
| - // Starts the animation to clear the fade-out animation effect
|
| - // for the all root windows.
|
| - void StartFadeInAnimation();
|
| + // DisplayAnimator
|
| + void StartFadeOutAnimation(base::Closure callback) override;
|
| + void StartFadeInAnimation() override;
|
|
|
| protected:
|
| // ui::DisplayConfigurator::Observer overrides:
|
| @@ -57,11 +56,11 @@ class ASH_EXPORT DisplayAnimator : public ui::DisplayConfigurator::Observer {
|
|
|
| std::map<aura::Window*, ui::Layer*> hiding_layers_;
|
| scoped_ptr<base::OneShotTimer> timer_;
|
| - base::WeakPtrFactory<DisplayAnimator> weak_ptr_factory_;
|
| + base::WeakPtrFactory<DisplayAnimatorChromeOS> weak_ptr_factory_;
|
|
|
| - DISALLOW_COPY_AND_ASSIGN(DisplayAnimator);
|
| + DISALLOW_COPY_AND_ASSIGN(DisplayAnimatorChromeOS);
|
| };
|
|
|
| } // namespace ash
|
|
|
| -#endif // ASH_DISPLAY_DISPLAY_ANIMATOR_H_
|
| +#endif // ASH_DISPLAY_DISPLAY_ANIMATOR_CHROMEOS_H_
|
|
|