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

Unified Diff: ash/common/shelf/app_list_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/aura/wm_shelf_aura.cc ('k') | ash/common/shelf/overflow_button.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/shelf/app_list_button.cc
diff --git a/ash/common/shelf/app_list_button.cc b/ash/common/shelf/app_list_button.cc
index 7781625be42f4dcf1ec8efdc890ac578b2477da5..c053f6b504187f9876b1f3b1cfedd4de4d5d2f1f 100644
--- a/ash/common/shelf/app_list_button.cc
+++ b/ash/common/shelf/app_list_button.cc
@@ -198,17 +198,13 @@ void AppListButton::PaintForegroundMD(gfx::Canvas* canvas,
void AppListButton::PaintAppListButton(gfx::Canvas* canvas,
const gfx::ImageSkia& foreground_image) {
- int background_image_id = 0;
+ int background_image_id = IDR_AURA_NOTIFICATION_BACKGROUND_NORMAL;
if (WmShell::Get()->GetAppListTargetVisibility() ||
draw_background_as_active_) {
background_image_id = IDR_AURA_NOTIFICATION_BACKGROUND_PRESSED;
- } else {
- if (wm_shelf_->IsDimmed()) {
- background_image_id = IDR_AURA_NOTIFICATION_BACKGROUND_ON_BLACK;
- } else {
- background_image_id = IDR_AURA_NOTIFICATION_BACKGROUND_NORMAL;
- }
+ } else if (wm_shelf_->GetBackgroundType() == SHELF_BACKGROUND_MAXIMIZED) {
+ background_image_id = IDR_AURA_NOTIFICATION_BACKGROUND_ON_BLACK;
}
ResourceBundle& rb = ResourceBundle::GetSharedInstance();
« no previous file with comments | « ash/aura/wm_shelf_aura.cc ('k') | ash/common/shelf/overflow_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698