ash/aura/wm_shelf_aura.h - Issue 2053113002: 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/aura/wm_shelf_aura.h

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

Patch Set: Moved ash/test/material_design_controller_test_api.(h|cc) to ash/common/material_design/test/. Created 4 years, 6 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/aura/wm_shelf_aura.h

diff --git a/ash/aura/wm_shelf_aura.h b/ash/aura/wm_shelf_aura.h

index b86e3d67fd9474a42d18d4e49c1bb559838a6115..d79b9430e36466a53e3a5fc68e5cb7fa83c5b1fa 100644

--- a/ash/aura/wm_shelf_aura.h

+++ b/ash/aura/wm_shelf_aura.h

@@ -34,6 +34,10 @@ class ASH_EXPORT WmShelfAura : public WmShelf,

static Shelf* GetShelf(WmShelf* shelf);

+ // WmShelf:

+ void AddObserver(WmShelfObserver* observer) override;

James Cook 2016/06/14 17:50:00 Why do these need to be public?

bruthig 2016/07/26 19:50:01 Reverted.

+ void RemoveObserver(WmShelfObserver* observer) override;

private:

void ResetShelfLayoutManager();

@@ -48,8 +52,6 @@ class ASH_EXPORT WmShelfAura : public WmShelf,

ShelfVisibilityState GetVisibilityState() const override;

void UpdateIconPositionForWindow(WmWindow* window) override;

gfx::Rect GetScreenBoundsOfItemIconForWindow(WmWindow* window) override;

- void AddObserver(WmShelfObserver* observer) override;

- void RemoveObserver(WmShelfObserver* observer) override;

// ShelfLayoutManagerObserver:

void WillDeleteShelfLayoutManager() override;

« ash/ash.gyp ('K') | « ash/ash.gyp ('k') | ash/aura/wm_shelf_aura.cc » ('j') | ash/aura/wm_shelf_aura.cc » ('J')