Revert of Replaced BackgroundAnimator with ShelfBackgroundAnimator.

ash/shelf/shelf_view.h

 // Copyright (c) 2012 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_VIEW_H_
 #define ASH_SHELF_SHELF_VIEW_H_
 
 #include <memory>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "ash/common/shelf/ink_drop_button_listener.h"
-#include "ash/common/shelf/shelf_background_animator_observer.h"
 #include "ash/common/shelf/shelf_button_pressed_metric_tracker.h"
 #include "ash/common/shelf/shelf_item_delegate.h"
 #include "ash/common/shelf/shelf_model_observer.h"
 #include "ash/common/shelf/shelf_tooltip_manager.h"
 #include "ash/wm/gestures/shelf_gesture_handler.h"
 #include "base/macros.h"
 #include "base/observer_list.h"
 #include "ui/app_list/views/app_list_drag_and_drop_host.h"
 #include "ui/views/animation/bounds_animator_observer.h"
 #include "ui/views/animation/ink_drop_state.h"
@@ skipping 13 matching lines @@
 class MenuRunner;
 }
 
 namespace ash {
 class AppListButton;
 class DragImageView;
 class OverflowBubble;
 class OverflowButton;
 class ScopedTargetRootWindow;
 class Shelf;
-class ShelfBackgroundAnimator;
 class ShelfButton;
 class ShelfDelegate;
 class ShelfIconObserver;
 class ShelfModel;
 struct ShelfItem;
 class WmShelf;
 
 namespace test {
 class ShelfViewTestAPI;
 }
 
 extern const int SHELF_ALIGNMENT_UMA_ENUM_VALUE_BOTTOM;
 extern const int SHELF_ALIGNMENT_UMA_ENUM_VALUE_LEFT;
 extern const int SHELF_ALIGNMENT_UMA_ENUM_VALUE_RIGHT;
 extern const int SHELF_ALIGNMENT_UMA_ENUM_VALUE_COUNT;
 
 class ASH_EXPORT ShelfView : public views::View,
-                             public ShelfBackgroundAnimatorObserver,
                              public ShelfModelObserver,
                              public InkDropButtonListener,
                              public views::ContextMenuController,
                              public views::FocusTraversable,
                              public views::BoundsAnimatorObserver,
                              public app_list::ApplicationDragAndDropHost {
  public:
   ShelfView(ShelfModel* model,
             ShelfDelegate* delegate,
             WmShelf* wm_shelf,
-            Shelf* shelf,
-            ShelfBackgroundAnimator* background_animator);
+            Shelf* shelf);
   ~ShelfView() override;
 
   Shelf* shelf() const { return shelf_; }
   WmShelf* wm_shelf() const { return wm_shelf_; }
   ShelfModel* model() const { return model_; }
 
   void Init();
 
   void OnShelfAlignmentChanged();
   void SchedulePaintForAllButtons();
@@ skipping 191 matching lines @@
   gfx::Size GetPreferredSize() const override;
   void OnBoundsChanged(const gfx::Rect& previous_bounds) override;
   FocusTraversable* GetPaneFocusTraversable() override;
   void GetAccessibleState(ui::AXViewState* state) override;
   void ViewHierarchyChanged(
       const ViewHierarchyChangedDetails& details) override;
 
   // Overridden from ui::EventHandler:
   void OnGestureEvent(ui::GestureEvent* event) override;
 
-  // ShelfBackgroundAnimatorObserver:
-  void UpdateShelfItemBackground(int alpha) override;
-
   // Overridden from ShelfModelObserver:
   void ShelfItemAdded(int model_index) override;
   void ShelfItemRemoved(int model_index, ShelfID id) override;
   void ShelfItemChanged(int model_index, const ShelfItem& old_item) override;
   void ShelfItemMoved(int start_index, int target_index) override;
   void OnSetShelfItemDelegate(ShelfID id,
                               ShelfItemDelegate* item_delegate) override;
 
   // Overridden from InkDropButtonListener:
   void ButtonPressed(views::Button* sender,
@@ skipping 165 matching lines @@
   bool is_repost_event_on_same_item_;
 
   // Record the index for the last pressed shelf item. This variable is used to
   // check if a repost event occurs on the same shelf item as previous one. If
   // so, the repost event should be ignored.
   int last_pressed_index_;
 
   // Tracks UMA metrics based on shelf button press actions.
   ShelfButtonPressedMetricTracker shelf_button_pressed_metric_tracker_;
 
-  // The background animator to observe. Can be null.
-  ShelfBackgroundAnimator* background_animator_;
-
   DISALLOW_COPY_AND_ASSIGN(ShelfView);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELF_SHELF_VIEW_H_