Index: ash/common/system/chromeos/palette/palette_tray.cc |
diff --git a/ash/common/system/chromeos/palette/palette_tray.cc b/ash/common/system/chromeos/palette/palette_tray.cc |
index 36f6cd9cfd2f9917f0a57df2a70fd9328b7ebe77..bc9b848dff5b71d33302684864bf0640bf65c28d 100644 |
--- a/ash/common/system/chromeos/palette/palette_tray.cc |
+++ b/ash/common/system/chromeos/palette/palette_tray.cc |
@@ -18,6 +18,7 @@ |
#include "ash/common/wm_root_window_controller.h" |
#include "ash/common/wm_shell.h" |
#include "ash/common/wm_window.h" |
+#include "ash/resources/vector_icons/vector_icons.h" |
#include "base/metrics/histogram_macros.h" |
#include "grit/ash_resources.h" |
#include "grit/ash_strings.h" |
@@ -87,8 +88,8 @@ class TitleView : public views::View, public views::ButtonListener { |
gfx::ImageSkia settings_icon = CreateVectorIcon( |
gfx::VectorIconId::SETTINGS, kIconSize, gfx::kChromeIconGrey); |
Evan Stade
2016/09/15 16:30:32
side note: should this be using kMenuIconColor?
mohsen
2016/09/15 20:54:45
Yep, I changed it to kMenuIconColor; also changed
Evan Stade
2016/09/19 19:30:33
thumbs up
|
- gfx::ImageSkia help_icon = CreateVectorIcon( |
- gfx::VectorIconId::HELP, kIconSize, gfx::kChromeIconGrey); |
+ gfx::ImageSkia help_icon = |
+ CreateVectorIcon(kSystemMenuHelpIcon, gfx::kChromeIconGrey); |
Evan Stade
2016/09/15 16:30:32
maybe DCHECK_EQ(kIconSize, help_icon.width())?
mohsen
2016/09/15 20:54:45
Sure. Done.
|
help_button_ = new ash::TrayPopupHeaderButton(this, help_icon, |
IDS_ASH_STATUS_TRAY_HELP); |