Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1611)

Unified Diff: ash/common/shelf/shelf_layout_manager.h

Issue 2679333002: [ash-md] Remove the number of animators used for the Shelf animations. (Closed)
Patch Set: Addressed review comments and updated ShelfBackgroundAnimator::animator_ lifetime. Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..bfaf19b0ce5329d54773294094dfd89cbbfc5591 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"
@@ -30,6 +29,10 @@ class ImplicitAnimationObserver;
class MouseEvent;
}
+namespace gfx {
+enum class AnimationChangeType;
+} // namespace gfx
+
namespace ash {
class PanelLayoutManagerTest;
@@ -242,7 +245,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(gfx::AnimationChangeType change_type);
// Updates the auto hide state immediately.
void UpdateAutoHideStateNow();

Powered by Google App Engine
This is Rietveld 408576698