ash/aura/wm_shelf_aura.cc - 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.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

Index: ash/aura/wm_shelf_aura.cc

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

index 36adc0ea8165c7a002a111654964e9e4fcbd9795..5d70a393b9f88343a9cc47b74bf7a9cd094c764f 100644

--- a/ash/aura/wm_shelf_aura.cc

+++ b/ash/aura/wm_shelf_aura.cc

@@ -178,8 +178,10 @@ void WmShelfAura::WillDeleteShelfLayoutManager() {

void WmShelfAura::OnBackgroundUpdated(

ShelfBackgroundType background_type,

BackgroundAnimatorChangeType change_type) {

+ if (background_type == GetBackgroundType())

+ return;

FOR_EACH_OBSERVER(WmShelfObserver, observers_,

- OnBackgroundUpdated(background_type, change_type));

+ OnBackgroundTypeChanged(background_type, change_type));

}

void WmShelfAura::WillChangeVisibilityState(ShelfVisibilityState new_state) {

« no previous file with comments | « ash/ash.gyp ('k') | ash/common/material_design/material_design_controller_unittest.cc » ('j') | no next file with comments »