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

Unified Diff: ash/shelf/shelf.h

Issue 2053113002: Replaced BackgroundAnimator with ShelfBackgroundAnimator. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Merge branch 'master' into animate_shelf_chip_backgrounds Created 4 years, 5 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
« no previous file with comments | « ash/root_window_controller.cc ('k') | ash/shelf/shelf.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/shelf.h
diff --git a/ash/shelf/shelf.h b/ash/shelf/shelf.h
index 4d85bb0fd9a53505a8b36b2a5a0862abdf1e6455..584543956e68c320cac9760035f5d0b19b9f7d92 100644
--- a/ash/shelf/shelf.h
+++ b/ash/shelf/shelf.h
@@ -37,6 +37,7 @@ class View;
namespace ash {
class AppListButton;
class FocusCycler;
+class ShelfBackgroundAnimator;
class ShelfDelegate;
class ShelfIconObserver;
class ShelfModel;
@@ -55,8 +56,9 @@ class ASH_EXPORT Shelf {
Shelf(ShelfModel* model,
WmShelf* wm_shelf,
- ShelfWidget* widget);
- virtual ~Shelf();
+ ShelfWidget* widget,
+ ShelfBackgroundAnimator* background_animator);
+ ~Shelf();
// 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
« no previous file with comments | « ash/root_window_controller.cc ('k') | ash/shelf/shelf.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698