More closely align palette to spec.

ash/common/system/tray/tray_popup_header_button.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/common/system/tray/tray_popup_header_button.h"
 
 #include "ash/common/ash_constants.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/views/background.h"
 #include "ui/views/painter.h"
 
 namespace ash {
 
+namespace {
+
+const gfx::ImageSkia* GetImageForResourceId(int resource_id) {
+  ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
+  return bundle.GetImageNamed(resource_id).ToImageSkia();
+}
+
+}  // namespace
+
 // static
 const char TrayPopupHeaderButton::kViewClassName[] =
     "tray/TrayPopupHeaderButton";
 
 TrayPopupHeaderButton::TrayPopupHeaderButton(views::ButtonListener* listener,
-                                             int icon_resource_id,
+                                             const gfx::ImageSkia& icon,
                                              int accessible_name_id)
     : views::ToggleImageButton(listener) {
   ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
-  SetImage(views::Button::STATE_NORMAL,
-           bundle.GetImageNamed(icon_resource_id).ToImageSkia());
+  SetImage(views::Button::STATE_NORMAL, &icon);
   SetImageAlignment(views::ImageButton::ALIGN_CENTER,
                     views::ImageButton::ALIGN_MIDDLE);
   SetAccessibleName(bundle.GetLocalizedString(accessible_name_id));
   SetFocusForPlatform();
 
   SetFocusPainter(views::Painter::CreateSolidFocusPainter(
       kFocusBorderColor, gfx::Insets(1, 2, 2, 3)));
 }
 
 TrayPopupHeaderButton::TrayPopupHeaderButton(views::ButtonListener* listener,
                                              int enabled_resource_id,
                                              int disabled_resource_id,
                                              int enabled_resource_id_hover,
                                              int disabled_resource_id_hover,
                                              int accessible_name_id)
-    : TrayPopupHeaderButton(listener, enabled_resource_id, accessible_name_id) {
+    : TrayPopupHeaderButton(listener,
+                            *GetImageForResourceId(enabled_resource_id),
+                            accessible_name_id) {

[stevenjb, 2016/08/24 15:58:57]

This is awkward and may be tricky to debug if GetImageForResourceId were to
return null. Instead, can we move the code in the constructor above into a
private method and call that from each constructor instead?

[jdufault, 2016/08/24 18:48:06]

Done.

   ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
   SetToggledImage(views::Button::STATE_NORMAL,
                   bundle.GetImageNamed(disabled_resource_id).ToImageSkia());
   SetImage(views::Button::STATE_HOVERED,
            bundle.GetImageNamed(enabled_resource_id_hover).ToImageSkia());
   SetToggledImage(
       views::Button::STATE_HOVERED,
       bundle.GetImageNamed(disabled_resource_id_hover).ToImageSkia());
 }
 
@@ skipping 12 matching lines @@
   if (state() == STATE_HOVERED || state() == STATE_PRESSED) {
     set_background(views::Background::CreateSolidBackground(
         kTrayPopupHoverBackgroundColor));
   } else {
     set_background(nullptr);
   }
   SchedulePaint();
 }
 
 }  // namespace ash