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

Unified Diff: ash/common/system/chromeos/palette/palette_tray.cc

Issue 2316183003: Move a bunch of ash-only vector icons to ash/. (Closed)
Patch Set: drop the "id". Just "icon". It's cleaner. 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
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 80ecc3bb8117eda76ff491066ee15d2dd80d69b0..0fb895f1abfc52b898ea345bc56a681cbc44f5d6 100644
--- a/ash/common/system/chromeos/palette/palette_tray.cc
+++ b/ash/common/system/chromeos/palette/palette_tray.cc
@@ -344,9 +344,10 @@ void PaletteTray::SetIconBorderForShelfAlignment() {
}
void PaletteTray::UpdateTrayIcon() {
- gfx::VectorIconId icon = palette_tool_manager_->GetActiveTrayIcon(
- palette_tool_manager_->GetActiveTool(ash::PaletteGroup::MODE));
- icon_->SetImage(CreateVectorIcon(icon, kShelfIconSize, kShelfIconColor));
+ icon_->SetImage(CreateVectorIcon(
+ palette_tool_manager_->GetActiveTrayIcon(
+ palette_tool_manager_->GetActiveTool(ash::PaletteGroup::MODE)),
+ kShelfIconSize, kShelfIconColor));
}
void PaletteTray::OnStylusStateChanged(ui::StylusState stylus_state) {

Powered by Google App Engine
This is Rietveld 408576698