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

Unified Diff: ash/shelf/shelf.cc

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/shelf/shelf.h ('k') | ash/shelf/shelf_layout_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/shelf.cc
diff --git a/ash/shelf/shelf.cc b/ash/shelf/shelf.cc
index a557586399a669219bb74b1273aa92156dccbfd3..fa88c8c65e66e337c136c1f5b731a4bc83cf2dff 100644
--- a/ash/shelf/shelf.cc
+++ b/ash/shelf/shelf.cc
@@ -41,13 +41,15 @@ const char Shelf::kNativeViewName[] = "ShelfView";
Shelf::Shelf(ShelfModel* shelf_model,
WmShelf* wm_shelf,
- ShelfWidget* shelf_widget)
+ ShelfWidget* shelf_widget,
+ ShelfBackgroundAnimator* background_animator)
: wm_shelf_(wm_shelf),
shelf_widget_(shelf_widget),
shelf_view_(new ShelfView(shelf_model,
WmShell::Get()->shelf_delegate(),
wm_shelf,
- this)),
+ this,
+ background_animator)),
shelf_locking_manager_(wm_shelf) {
DCHECK(wm_shelf_);
shelf_view_->Init();
« no previous file with comments | « ash/shelf/shelf.h ('k') | ash/shelf/shelf_layout_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698