| 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) {
|
|
|