| Index: ash/common/shelf/shelf_layout_manager.h
|
| diff --git a/ash/common/shelf/shelf_layout_manager.h b/ash/common/shelf/shelf_layout_manager.h
|
| index 4949ea8e65d0fdf3d98b0a000eeee0e0945d0496..87f598a8bd6267c271b5aa9a1230e5e023772d4b 100644
|
| --- a/ash/common/shelf/shelf_layout_manager.h
|
| +++ b/ash/common/shelf/shelf_layout_manager.h
|
| @@ -11,7 +11,6 @@
|
| #include "ash/common/session/session_state_observer.h"
|
| #include "ash/common/shelf/wm_shelf.h"
|
| #include "ash/common/shell_observer.h"
|
| -#include "ash/common/wm/background_animator.h"
|
| #include "ash/common/wm/dock/docked_window_layout_manager_observer.h"
|
| #include "ash/common/wm/lock_state_observer.h"
|
| #include "ash/common/wm/wm_snap_to_pixel_layout_manager.h"
|
| @@ -32,6 +31,7 @@ class MouseEvent;
|
|
|
| namespace ash {
|
|
|
| +enum class AnimationChangeType;
|
| class PanelLayoutManagerTest;
|
| class ShelfLayoutManagerObserver;
|
| class ShelfLayoutManagerTest;
|
| @@ -242,7 +242,7 @@ class ASH_EXPORT ShelfLayoutManager
|
| void UpdateTargetBoundsForGesture(TargetBounds* target_bounds) const;
|
|
|
| // Updates the background of the shelf if it has changed.
|
| - void MaybeUpdateShelfBackground(BackgroundAnimatorChangeType change_type);
|
| + void MaybeUpdateShelfBackground(AnimationChangeType change_type);
|
|
|
| // Updates the auto hide state immediately.
|
| void UpdateAutoHideStateNow();
|
|
|