Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / ash / shelf / background_animator.h

diff --git a/src/ash/shelf/background_animator.h b/src/ash/shelf/background_animator.h
index 805f7d5..4c01ac1 100644 (file)
--- a/src/ash/shelf/background_animator.h
+++ b/src/ash/shelf/background_animator.h
@@ -18,8 +18,6 @@ enum BackgroundAnimatorChangeType {
   BACKGROUND_CHANGE_IMMEDIATE
 };
 
-namespace internal {
-
 // Delegate is notified any time the background changes.
 class ASH_EXPORT BackgroundAnimatorDelegate {
  public:
@@ -35,7 +33,7 @@ class ASH_EXPORT BackgroundAnimator : public gfx::AnimationDelegate {
   BackgroundAnimator(BackgroundAnimatorDelegate* delegate,
                      int min_alpha,
                      int max_alpha);
-  virtual ~BackgroundAnimator();
+  ~BackgroundAnimator() override;
 
   // Sets the transition time in ms.
   void SetDuration(int time_in_ms);
@@ -50,7 +48,7 @@ class ASH_EXPORT BackgroundAnimator : public gfx::AnimationDelegate {
   int alpha() const { return alpha_; }
 
   // gfx::AnimationDelegate overrides:
-  virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE;
+  void AnimationProgressed(const gfx::Animation* animation) override;
 
  private:
   BackgroundAnimatorDelegate* delegate_;
@@ -69,7 +67,6 @@ class ASH_EXPORT BackgroundAnimator : public gfx::AnimationDelegate {
   DISALLOW_COPY_AND_ASSIGN(BackgroundAnimator);
 };
 
-}  // namespace internal
 }  // namespace ash
 
 #endif  // ASH_SHELF_BACKGROUND_ANIMATOR_H_