| Index: ash/common/shelf/shelf_background_animator.h
|
| diff --git a/ash/common/shelf/shelf_background_animator.h b/ash/common/shelf/shelf_background_animator.h
|
| index 5b2068f5cf28bcedfd39b4367f21e46792202698..fcc95dd26a905dff656bd445075d59acc3d42215 100644
|
| --- a/ash/common/shelf/shelf_background_animator.h
|
| +++ b/ash/common/shelf/shelf_background_animator.h
|
| @@ -5,6 +5,7 @@
|
| #ifndef ASH_COMMON_SHELF_SHELF_BACKGROUND_ANIMATOR_H_
|
| #define ASH_COMMON_SHELF_SHELF_BACKGROUND_ANIMATOR_H_
|
|
|
| +#include <memory>
|
| #include <vector>
|
|
|
| #include "ash/ash_export.h"
|
| @@ -25,12 +26,8 @@ class WmShelf;
|
| // The ShelfBackgroundAnimator is capable of observing a WmShelf instance for
|
| // background type changes or clients can call PaintBackground() directly.
|
| //
|
| -// The Shelf uses 3 surfaces for the animations:
|
| +// The Shelf uses 2 surfaces for the animations:
|
| //
|
| -// Non-Material Design:
|
| -// 1. Shelf button backgrounds
|
| -// 2. Opaque overlay for the SHELF_BACKGROUND_MAXIMIZED state.
|
| -// 3. Shelf and Dock assets for the SHELF_BACKGROUND_OVERLAP state.
|
| // Material Design:
|
| // 1. Shelf button backgrounds
|
| // 2. Opaque overlay for the SHELF_BACKGROUND_OVERLAP and
|
| @@ -108,10 +105,6 @@ class ASH_EXPORT ShelfBackgroundAnimator : public WmShelfObserver,
|
| // gfx::SlideAnimation.
|
| std::unique_ptr<BackgroundAnimator> opaque_background_animator_;
|
|
|
| - // Animates the asset/image based background of the Shelf.
|
| - // TODO(bruthig): Remove when non-md is no longer needed (crbug.com/614453).
|
| - std::unique_ptr<BackgroundAnimator> asset_background_animator_;
|
| -
|
| // Animates the backgrounds of Shelf child Views.
|
| std::unique_ptr<BackgroundAnimator> item_background_animator_;
|
|
|
|
|