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

Issues Search
    My Issues | Starred     Open | Closed | All

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: Added PaletteTray to the Shelf background animations. 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/ash.gyp ('k') | ash/common/material_design/material_design_controller_unittest.cc » ('j') | ash/common/shelf/shelf_background_animator.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/aura/wm_shelf_aura.cc
diff --git a/ash/aura/wm_shelf_aura.cc b/ash/aura/wm_shelf_aura.cc
index 50f6389a58b506bacc8971bf13aafcf9015d75be..4e7bbdab8c07ffe4601da71d3d441ce7d85c6f40 100644
--- a/ash/aura/wm_shelf_aura.cc
+++ b/ash/aura/wm_shelf_aura.cc
@@ -174,8 +174,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));
+ OnBackgroundChanged(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') | ash/common/shelf/shelf_background_animator.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698