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

Unified Diff: ash/common/shelf/overflow_button.cc

Issue 2190773003: [ABANDONED] Simplify ash shelf dimmer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Restore an EventHandler object; fix behavior tests. 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/common/shelf/app_list_button.cc ('k') | ash/common/shelf/wm_shelf.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/shelf/overflow_button.cc
diff --git a/ash/common/shelf/overflow_button.cc b/ash/common/shelf/overflow_button.cc
index 6a8585750c7b971d02bd366fab49fbebf2915ea9..0e2c835a3707eef7f672711aa49280c78c58994b 100644
--- a/ash/common/shelf/overflow_button.cc
+++ b/ash/common/shelf/overflow_button.cc
@@ -128,7 +128,7 @@ void OverflowButton::PaintForeground(gfx::Canvas* canvas,
int OverflowButton::NonMaterialBackgroundImageId() {
if (wm_shelf_->IsShowingOverflowBubble())
return IDR_AURA_NOTIFICATION_BACKGROUND_PRESSED;
- else if (wm_shelf_->IsDimmed())
+ else if (wm_shelf_->GetBackgroundType() == SHELF_BACKGROUND_MAXIMIZED)
return IDR_AURA_NOTIFICATION_BACKGROUND_ON_BLACK;
return IDR_AURA_NOTIFICATION_BACKGROUND_NORMAL;
}
« no previous file with comments | « ash/common/shelf/app_list_button.cc ('k') | ash/common/shelf/wm_shelf.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698