Replaced BackgroundAnimator with ShelfBackgroundAnimator.

ash/shelf/shelf.h

 // Copyright 2013 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_H_
 #define ASH_SHELF_SHELF_H_
 
 #include <stdint.h>
 
 #include <memory>
 
 #include "ash/ash_export.h"
+#include "ash/common/shelf/shelf_background_animator_observer.h"
 #include "ash/common/shelf/shelf_constants.h"
 #include "ash/common/shelf/shelf_locking_manager.h"
 #include "ash/common/shelf/shelf_types.h"
 #include "ash/shelf/shelf_widget.h"
 #include "base/macros.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/views/widget/widget_observer.h"
 
 namespace app_list {
 class ApplicationDragAndDropHost;
@@ skipping 19 matching lines @@
 class ShelfModel;
 class ShelfView;
 class WmShelf;
 
 namespace test {
 class ShelfTestAPI;
 }
 
 // Controller for shelf state. All access to state (visibility, auto-hide, etc.)
 // should occur via this class.
-class ASH_EXPORT Shelf {
+class ASH_EXPORT Shelf : public ShelfBackgroundAnimatorObserver {

[James Cook, 2016/07/27 00:30:39]

Can the ShelfBackgroundAnimatorObserver live somewhere other than on Shelf?
Maybe on ShelfView, or ShelfWidget, or failing that WmShelf? I'm trying to get
rid of Shelf.

[bruthig, 2016/07/27 17:05:45]

I made the ShelfView extend the ShelfBackgroundAnimatorObserver and passed the
ShelfBackgroundAnimator owned by the ShelfWidget to the ShelfView so that the
ShelfView can add/remove itself as an observer.

PTAL

  public:
   static const char kNativeViewName[];
 
   Shelf(ShelfModel* model,
         WmShelf* wm_shelf,
         ShelfWidget* widget);
-  virtual ~Shelf();
+  ~Shelf() override;
 
   // Return the shelf for the primary display. NULL if no user is logged in yet.
   // Useful for tests. For production code use ForWindow() because the user may
   // have multiple displays.
   static Shelf* ForPrimaryDisplay();
 
   // Return the shelf for the display that |window| is currently on, or a shelf
   // on primary display if the shelf per display feature is disabled. NULL if no
   // user is logged in yet.
   static Shelf* ForWindow(const aura::Window* window);
@@ skipping 75 matching lines @@
     return shelf_widget_->shelf_layout_manager();
   }
 
   // Returns rectangle bounding all visible shelf items. Used screen coordinate
   // system.
   gfx::Rect GetVisibleItemsBoundsInScreen() const;
 
   // Returns ApplicationDragAndDropHost for this shelf.
   app_list::ApplicationDragAndDropHost* GetDragAndDropHostForAppList();
 
+  // ShelfBackgroundAnimatorObserver:
+  void UpdateShelfItemBackground(int alpha) override;
+
   ShelfLockingManager* shelf_locking_manager_for_testing() {
     return &shelf_locking_manager_;
   }
 
  private:
   friend class test::ShelfTestAPI;
 
   // The shelf controller. Owned by the root window controller.
   WmShelf* wm_shelf_;
   ShelfWidget* shelf_widget_;
   ShelfView* shelf_view_;
   ShelfLockingManager shelf_locking_manager_;
 
   ShelfAlignment alignment_ = SHELF_ALIGNMENT_BOTTOM;
   ShelfAutoHideBehavior auto_hide_behavior_ = SHELF_AUTO_HIDE_BEHAVIOR_NEVER;
 
   DISALLOW_COPY_AND_ASSIGN(Shelf);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELF_SHELF_H_