Leave ChromeOS system menu open when toggling nightlight.

ash/system/tray/system_menu_button.cc

 // Copyright 2016 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/system/tray/system_menu_button.h"
 
 #include "ash/ash_constants.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_popup_utils.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/views/animation/flood_fill_ink_drop_ripple.h"
 #include "ui/views/animation/ink_drop_highlight.h"
 #include "ui/views/animation/ink_drop_impl.h"
 #include "ui/views/animation/ink_drop_mask.h"
 #include "ui/views/animation/square_ink_drop_ripple.h"
 #include "ui/views/border.h"
 #include "ui/views/painter.h"
 
 namespace ash {
 
 SystemMenuButton::SystemMenuButton(views::ButtonListener* listener,
                                    TrayPopupInkDropStyle ink_drop_style,
-                                   gfx::ImageSkia normal_icon,
-                                   gfx::ImageSkia disabled_icon,
+                                   const gfx::ImageSkia& normal_icon,
+                                   const gfx::ImageSkia& disabled_icon,
                                    int accessible_name_id)
     : views::ImageButton(listener), ink_drop_style_(ink_drop_style) {
   DCHECK_EQ(normal_icon.width(), disabled_icon.width());
   DCHECK_EQ(normal_icon.height(), disabled_icon.height());
 
-  SetImage(views::Button::STATE_NORMAL, &normal_icon);
-  SetImage(views::Button::STATE_DISABLED, &disabled_icon);
+  SetImage(views::Button::STATE_NORMAL, normal_icon);
+  SetImage(views::Button::STATE_DISABLED, disabled_icon);
 
   const int horizontal_padding = (kMenuButtonSize - normal_icon.width()) / 2;
   const int vertical_padding = (kMenuButtonSize - normal_icon.height()) / 2;
   SetBorder(views::CreateEmptyBorder(vertical_padding, horizontal_padding,
                                      vertical_padding, horizontal_padding));
 
   SetTooltipText(l10n_util::GetStringUTF16(accessible_name_id));
 
   SetFocusPainter(TrayPopupUtils::CreateFocusPainter());
   TrayPopupUtils::ConfigureTrayPopupButton(this);
 }
 
 SystemMenuButton::SystemMenuButton(views::ButtonListener* listener,
                                    TrayPopupInkDropStyle ink_drop_style,
                                    const gfx::VectorIcon& icon,
                                    int accessible_name_id)
     : SystemMenuButton(listener,
                        ink_drop_style,
-                       gfx::CreateVectorIcon(icon, kMenuIconColor),
-                       gfx::CreateVectorIcon(icon, kMenuIconColorDisabled),
-                       accessible_name_id) {}
+                       gfx::ImageSkia(),
+                       gfx::ImageSkia(),
+                       accessible_name_id) {
+  SetVectorIcon(icon);
+}
+
+void SystemMenuButton::SetVectorIcon(const gfx::VectorIcon& icon) {
+  SetImage(views::Button::STATE_NORMAL,
+           gfx::CreateVectorIcon(icon, kMenuIconColor));
+  SetImage(views::Button::STATE_DISABLED,
+           gfx::CreateVectorIcon(icon, kMenuIconColorDisabled));
+}
 
 SystemMenuButton::~SystemMenuButton() {}
 
 void SystemMenuButton::SetInkDropColor(SkColor color) {
   ink_drop_color_ = color;
 }
 
 std::unique_ptr<views::InkDrop> SystemMenuButton::CreateInkDrop() {
   return TrayPopupUtils::CreateInkDrop(ink_drop_style_, this);
 }
@@ skipping 15 matching lines @@
              : TrayPopupUtils::CreateInkDropHighlight(ink_drop_style_, this,
                                                       ink_drop_color_.value());
 }
 
 std::unique_ptr<views::InkDropMask> SystemMenuButton::CreateInkDropMask()
     const {
   return TrayPopupUtils::CreateInkDropMask(ink_drop_style_, this);
 }
 
 }  // namespace ash