ash/shelf/shelf.h - Issue 2191153002: Revert of Replaced BackgroundAnimator with ShelfBackgroundAnimator.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ash/shelf/shelf.h

Issue 2191153002: Revert of Replaced BackgroundAnimator with ShelfBackgroundAnimator. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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

Index: ash/shelf/shelf.h

diff --git a/ash/shelf/shelf.h b/ash/shelf/shelf.h

index 584543956e68c320cac9760035f5d0b19b9f7d92..4d85bb0fd9a53505a8b36b2a5a0862abdf1e6455 100644

--- a/ash/shelf/shelf.h

+++ b/ash/shelf/shelf.h

@@ -37,7 +37,6 @@

namespace ash {

class AppListButton;

class FocusCycler;

-class ShelfBackgroundAnimator;

class ShelfDelegate;

class ShelfIconObserver;

class ShelfModel;

@@ -56,9 +55,8 @@

Shelf(ShelfModel* model,

WmShelf* wm_shelf,

- ShelfWidget* widget,

- ShelfBackgroundAnimator* background_animator);

- ~Shelf();

+ ShelfWidget* widget);

+ virtual ~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 »