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

Unified Diff: ash/common/system/tray/tray_background_view.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/wm_shelf.h ('k') | ash/mus/bridge/wm_shelf_mus.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/system/tray/tray_background_view.cc
diff --git a/ash/common/system/tray/tray_background_view.cc b/ash/common/system/tray/tray_background_view.cc
index 569e939369e26c480a368488596996bd1150bdf7..62e81530c0f599f134f81d060df642b9d5ca4994 100644
--- a/ash/common/system/tray/tray_background_view.cc
+++ b/ash/common/system/tray/tray_background_view.cc
@@ -145,10 +145,8 @@ class TrayBackground : public views::Background {
int state = kImageTypeDefault;
if (tray_background_view_->draw_background_as_active())
state = kImageTypePressed;
- else if (shelf->IsDimmed())
+ else if (shelf->GetBackgroundType() == SHELF_BACKGROUND_MAXIMIZED)
state = kImageTypeOnBlack;
- else
- state = kImageTypeDefault;
ui::CreateNineImagePainter(kImages[orientation][state])
->Paint(canvas, view->GetLocalBounds());
« no previous file with comments | « ash/common/shelf/wm_shelf.h ('k') | ash/mus/bridge/wm_shelf_mus.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698