Changed the Launcher shelf icon in ChromeOS.
Was a 9-square app grid; now a magnifying glass. This better represents
the new "Ares" launcher interface, which is focused on search. (The old
icon is still used if the --disable-experimental-app-list flag is
given.)
BUG=458353
TBR=oshima@chromium.org
Review URL: https://codereview.chromium.org/928063002
Cr-Commit-Position: refs/heads/master@{#316712}
diff --git a/ash/resources/ash_resources.grd b/ash/resources/ash_resources.grd
index 839a289..6b49345 100644
--- a/ash/resources/ash_resources.grd
+++ b/ash/resources/ash_resources.grd
@@ -15,7 +15,8 @@
<structure type="chrome_scaled_image" name="IDR_ASH_SHELF_BACKGROUND" file="common/shelf/shelf_background.png" />
<structure type="chrome_scaled_image" name="IDR_ASH_SHELF_CORNER" file="common/shelf/shelf_corner.png" />
<structure type="chrome_scaled_image" name="IDR_ASH_SHELF_DIMMING" file="common/shelf/shelf_dimming.png" />
- <structure type="chrome_scaled_image" name="IDR_ASH_SHELF_ICON_APPLIST" file="common/shelf/status_app_menu_icon.png" />
+ <structure type="chrome_scaled_image" name="IDR_ASH_SHELF_ICON_APPLIST" file="common/shelf/status_launcher_menu_icon.png" />
+ <structure type="chrome_scaled_image" name="IDR_ASH_SHELF_ICON_APPLIST_CLASSIC" file="common/shelf/status_app_menu_icon.png" />
<structure type="chrome_scaled_image" name="IDR_ASH_SHELF_LIST_BROWSER" file="common/shelf/window_switcher_icon_normal.png" />
<structure type="chrome_scaled_image" name="IDR_ASH_SHELF_LIST_INCOGNITO_BROWSER" file="common/shelf/window_switcher_icon_incognito.png" />
<structure type="chrome_scaled_image" name="IDR_ASH_SHELF_OVERFLOW" file="common/shelf/shelf_overflow.png" />
diff --git a/ash/resources/default_100_percent/common/shelf/status_launcher_menu_icon.png b/ash/resources/default_100_percent/common/shelf/status_launcher_menu_icon.png
new file mode 100644
index 0000000..2c2b9e8
--- /dev/null
+++ b/ash/resources/default_100_percent/common/shelf/status_launcher_menu_icon.png
Binary files differ
diff --git a/ash/resources/default_200_percent/common/shelf/status_launcher_menu_icon.png b/ash/resources/default_200_percent/common/shelf/status_launcher_menu_icon.png
new file mode 100644
index 0000000..a7e0c78
--- /dev/null
+++ b/ash/resources/default_200_percent/common/shelf/status_launcher_menu_icon.png
Binary files differ
diff --git a/ash/shelf/app_list_button.cc b/ash/shelf/app_list_button.cc
index 259c825..8ae3c78 100644
--- a/ash/shelf/app_list_button.cc
+++ b/ash/shelf/app_list_button.cc
@@ -140,8 +140,13 @@
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;
