chromeos: Rename ash::WmShelf to Shelf

ash/shelf/shelf_background_animator.h

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef ASH_SHELF_SHELF_BACKGROUND_ANIMATOR_H_
 #define ASH_SHELF_SHELF_BACKGROUND_ANIMATOR_H_
 
 #include <memory>
 #include <vector>
 
 #include "ash/ash_export.h"
 #include "ash/public/cpp/shelf_types.h"
-#include "ash/shelf/wm_shelf_observer.h"
+#include "ash/shelf/shelf_observer.h"
 #include "ash/wallpaper/wallpaper_controller_observer.h"
 #include "base/macros.h"
 #include "base/observer_list.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/animation/animation_delegate.h"
 
 namespace gfx {
 class SlideAnimation;
 }  // namespace gfx
 
 namespace ash {
 
 enum class AnimationChangeType;
+class Shelf;
 class ShelfBackgroundAnimatorObserver;
 class ShelfBackgroundAnimatorTestApi;
 class WallpaperController;
-class WmShelf;
 
 // Central controller for the Shelf and Dock opacity animations.
 //
-// The ShelfBackgroundAnimator is capable of observing a WmShelf instance for
+// The ShelfBackgroundAnimator is capable of observing a Shelf instance for
 // background type changes or clients can call PaintBackground() directly.
 //
 // The Shelf uses 2 surfaces for the animations:
 //
 //  Material Design:
 //    1. Shelf button backgrounds
 //    2. Overlay for the SHELF_BACKGROUND_OVERLAP and SHELF_BACKGROUND_MAXIMIZED
 //       states.
-class ASH_EXPORT ShelfBackgroundAnimator : public WmShelfObserver,
+class ASH_EXPORT ShelfBackgroundAnimator : public ShelfObserver,
                                            public gfx::AnimationDelegate,
                                            public WallpaperControllerObserver {
  public:
   // The maximum alpha value that can be used.
   static const int kMaxAlpha = SK_AlphaOPAQUE;
 
   // Initializes this with the given |background_type|. This will observe the
-  // |wm_shelf| for background type changes and the |wallpaper_controller| for
+  // |shelf| for background type changes and the |wallpaper_controller| for
   // wallpaper changes if not null.
   ShelfBackgroundAnimator(ShelfBackgroundType background_type,
-                          WmShelf* wm_shelf,
+                          Shelf* shelf,
                           WallpaperController* wallpaper_controller);
   ~ShelfBackgroundAnimator() override;
 
   ShelfBackgroundType target_background_type() const {
     return target_background_type_;
   }
 
   // Initializes |observer| with current values using the Initialize() function.
   void AddObserver(ShelfBackgroundAnimatorObserver* observer);
   void RemoveObserver(ShelfBackgroundAnimatorObserver* observer);
@@ skipping 12 matching lines @@
   // BACKGROUND_CHANGE_ANIMATE change type is received it will be ignored and
   // observers will NOT be notified.
   void PaintBackground(ShelfBackgroundType background_type,
                        AnimationChangeType change_type);
 
   // gfx::AnimationDelegate:
   void AnimationProgressed(const gfx::Animation* animation) override;
   void AnimationEnded(const gfx::Animation* animation) override;
 
  protected:
-  // WmShelfObserver:
+  // ShelfObserver:
   void OnBackgroundTypeChanged(ShelfBackgroundType background_type,
                                AnimationChangeType change_type) override;
 
   // WallpaperControllerObserver:
   void OnWallpaperDataChanged() override;
   void OnWallpaperColorsChanged() override;
 
  private:
   friend class ShelfBackgroundAnimatorTestApi;
 
@@ skipping 51 matching lines @@
                        AnimationValues* item_background_values) const;
 
   // Updates the animation values corresponding to the |t| value between 0 and
   // 1.
   void SetAnimationValues(double t);
 
   // Called when observers need to be notified.
   void NotifyObservers();
 
   // The shelf to observe for changes to the shelf background type, can be null.
-  WmShelf* wm_shelf_;
+  Shelf* shelf_;
 
   // The wallpaper controller to observe for changes and to extract colors from.
   WallpaperController* wallpaper_controller_;
 
   // The background type that this is animating towards or has reached.
   ShelfBackgroundType target_background_type_ = SHELF_BACKGROUND_DEFAULT;
 
   // The last background type this is animating away from.
   ShelfBackgroundType previous_background_type_ = SHELF_BACKGROUND_MAXIMIZED;
 
   // Drives the animtion.
   std::unique_ptr<gfx::SlideAnimation> animator_;
 
   // Tracks the shelf background animation values.
   AnimationValues shelf_background_values_;
 
   // Tracks the item background animation values.
   AnimationValues item_background_values_;
 
   base::ObserverList<ShelfBackgroundAnimatorObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(ShelfBackgroundAnimator);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELF_SHELF_BACKGROUND_ANIMATOR_H_