| Index: ash/shelf/shelf_widget.h
|
| diff --git a/ash/shelf/shelf_widget.h b/ash/shelf/shelf_widget.h
|
| index 8180c162acd11bb752eeca0e65c4d36bfbf31286..d848cf2e8e6a2241f243b6bf386f462c24b08d56 100644
|
| --- a/ash/shelf/shelf_widget.h
|
| +++ b/ash/shelf/shelf_widget.h
|
| @@ -9,7 +9,7 @@
|
|
|
| #include "ash/ash_export.h"
|
| #include "ash/common/shelf/shelf_types.h"
|
| -#include "ash/common/wm/background_animator.h"
|
| +#include "ash/shelf/shelf_background_animator.h"
|
| #include "ash/shelf/shelf_layout_manager_observer.h"
|
| #include "base/macros.h"
|
| #include "ui/views/widget/widget.h"
|
| @@ -111,7 +111,7 @@ class ASH_EXPORT ShelfWidget : public views::Widget,
|
| // |delegate_view_| is the contents view of this widget and is cleaned up
|
| // during CloseChildWindows of the associated RootWindowController.
|
| DelegateView* delegate_view_;
|
| - BackgroundAnimator background_animator_;
|
| + ShelfBackgroundAnimator background_animator_;
|
| bool activating_as_fallback_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ShelfWidget);
|
|
|