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

Unified Diff: ash/shelf/app_list_button.cc

Issue 928063002: Changed the Launcher shelf icon in ChromeOS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Crush pngs. Created 5 years, 10 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/resources/default_200_percent/common/shelf/status_launcher_menu_icon.png ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/app_list_button.cc
diff --git a/ash/shelf/app_list_button.cc b/ash/shelf/app_list_button.cc
index 259c82566e282628bdfd064d69b5f67abf5a576a..8ae3c78985b0a53d8df6975356eef106cad0c38b 100644
--- a/ash/shelf/app_list_button.cc
+++ b/ash/shelf/app_list_button.cc
@@ -140,8 +140,13 @@ void AppListButton::OnPaint(gfx::Canvas* canvas) {
ResourceBundle& rb = ResourceBundle::GetSharedInstance();
const gfx::ImageSkia* background_image =
rb.GetImageNamed(background_image_id).ToImageSkia();
+ // TODO(mgiuca): When the "classic" app list is removed, also remove this
+ // resource and its icon file.
+ int foreground_image_id = app_list::switches::IsExperimentalAppListEnabled()
+ ? IDR_ASH_SHELF_ICON_APPLIST
+ : IDR_ASH_SHELF_ICON_APPLIST_CLASSIC;
const gfx::ImageSkia* forground_image =
- rb.GetImageNamed(IDR_ASH_SHELF_ICON_APPLIST).ToImageSkia();
+ rb.GetImageNamed(foreground_image_id).ToImageSkia();
gfx::Rect contents_bounds = GetContentsBounds();
gfx::Rect background_bounds, forground_bounds;
« no previous file with comments | « ash/resources/default_200_percent/common/shelf/status_launcher_menu_icon.png ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698