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

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

Issue 2324913002: Updates to shelf icons for Ash material design (Closed)
Patch Set: remove size parameter Created 4 years, 3 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 | « no previous file | ash/common/system/web_notification/web_notification_tray.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 6ecfd3349878e56a3ce8caebc264528830ce2b05..5b5b117b7cae25c828d614a72e33b4fbd2cf4b69 100644
--- a/ash/common/shelf/app_list_button.cc
+++ b/ash/common/shelf/app_list_button.cc
@@ -14,6 +14,7 @@
#include "ash/common/shelf/wm_shelf.h"
#include "ash/common/shelf/wm_shelf_util.h"
#include "ash/common/wm_shell.h"
+#include "ash/resources/vector_icons/vector_icons.h"
#include "base/command_line.h"
#include "grit/ash_resources.h"
#include "grit/ash_strings.h"
@@ -23,7 +24,6 @@
#include "ui/base/resource/resource_bundle.h"
#include "ui/gfx/canvas.h"
#include "ui/gfx/paint_vector_icon.h"
-#include "ui/gfx/vector_icons_public.h"
#include "ui/views/animation/square_ink_drop_ripple.h"
#include "ui/views/painter.h"
@@ -146,7 +146,7 @@ void AppListButton::OnPaint(gfx::Canvas* canvas) {
const gfx::ImageSkia& foreground_image =
MaterialDesignController::IsShelfMaterial()
- ? CreateVectorIcon(gfx::VectorIconId::SHELF_APPLIST, kShelfIconColor)
+ ? CreateVectorIcon(kShelfAppListIcon, kShelfIconColor)
: *rb.GetImageNamed(IDR_ASH_SHELF_ICON_APPLIST).ToImageSkia();
if (ash::MaterialDesignController::IsShelfMaterial()) {
« no previous file with comments | « no previous file | ash/common/system/web_notification/web_notification_tray.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698