Leave ChromeOS system menu open when toggling nightlight.

ash/system/tiles/tiles_default_view.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/tiles/tiles_default_view.h"
 
 #include "ash/metrics/user_metrics_action.h"
 #include "ash/resources/vector_icons/vector_icons.h"
 #include "ash/session/session_controller.h"
 #include "ash/shell.h"
@@ skipping 10 matching lines @@
 #include "ash/wm/lock_state_controller.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/session_manager_client.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/geometry/insets.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/button/custom_button.h"
 #include "ui/views/controls/separator.h"
 #include "ui/views/layout/box_layout.h"
 
+namespace ash {
+
 namespace {
 
 // The ISO-639 code for the Hebrew locale. The help icon asset is a '?' which is
 // not mirrored in this locale.
 const char kHebrewLocale[] = "he";
 
+const gfx::VectorIcon& GetNightLightButtonIcon() {
+  return Shell::Get()->night_light_controller()->GetEnabled()
+             ? kSystemMenuNightLightOnIcon
+             : kSystemMenuNightLightOffIcon;
+}
+
 }  // namespace
 
-namespace ash {
-
 TilesDefaultView::TilesDefaultView(SystemTrayItem* owner)
     : owner_(owner),
       settings_button_(nullptr),
       help_button_(nullptr),
       night_light_button_(nullptr),
       lock_button_(nullptr),
       power_button_(nullptr) {
   DCHECK(owner_);
 }
 
@@ skipping 27 matching lines @@
       base::i18n::GetConfiguredLocale() == kHebrewLocale) {
     // The asset for the help button is a question mark '?'. Normally this asset
     // is flipped in RTL locales, however Hebrew uses the LTR '?'. So the
     // flipping must be disabled. (crbug.com/475237)
     help_button_->EnableCanvasFlippingForRTLUI(false);
   }
   help_button_->SetEnabled(can_show_web_ui);
   AddChildView(help_button_);
   AddChildView(TrayPopupUtils::CreateVerticalSeparator());
 
-  night_light_button_ =
-      new SystemMenuButton(this, TrayPopupInkDropStyle::HOST_CENTERED,
-                           Shell::Get()->night_light_controller()->GetEnabled()
-                               ? kSystemMenuNightLightOnIcon
-                               : kSystemMenuNightLightOffIcon,
-                           IDS_ASH_STATUS_TRAY_NIGHT_LIGHT);
+  night_light_button_ = new SystemMenuButton(
+      this, TrayPopupInkDropStyle::HOST_CENTERED, GetNightLightButtonIcon(),
+      IDS_ASH_STATUS_TRAY_NIGHT_LIGHT);
   night_light_button_->SetEnabled(can_show_web_ui);
   AddChildView(night_light_button_);
   AddChildView(TrayPopupUtils::CreateVerticalSeparator());
 
   lock_button_ =
       new SystemMenuButton(this, TrayPopupInkDropStyle::HOST_CENTERED,
                            kSystemMenuLockIcon, IDS_ASH_STATUS_TRAY_LOCK);
   lock_button_->SetEnabled(can_show_web_ui &&
                            Shell::Get()->session_controller()->CanLockScreen());
 
@@ skipping 16 matching lines @@
   DCHECK(sender);
   if (sender == settings_button_) {
     ShellPort::Get()->RecordUserMetricsAction(UMA_TRAY_SETTINGS);
     Shell::Get()->system_tray_controller()->ShowSettings();
   } else if (sender == help_button_) {
     ShellPort::Get()->RecordUserMetricsAction(UMA_TRAY_HELP);
     Shell::Get()->system_tray_controller()->ShowHelp();
   } else if (sender == night_light_button_) {
     ShellPort::Get()->RecordUserMetricsAction(UMA_TRAY_NIGHT_LIGHT);
     Shell::Get()->night_light_controller()->Toggle();
+    night_light_button_->SetVectorIcon(GetNightLightButtonIcon());
   } else if (sender == lock_button_) {
     ShellPort::Get()->RecordUserMetricsAction(UMA_TRAY_LOCK_SCREEN);
     chromeos::DBusThreadManager::Get()
         ->GetSessionManagerClient()
         ->RequestLockScreen();
   } else if (sender == power_button_) {
     ShellPort::Get()->RecordUserMetricsAction(UMA_TRAY_SHUT_DOWN);
     Shell::Get()->lock_state_controller()->RequestShutdown();
   }
-
-  owner_->system_tray()->CloseSystemBubble();
 }
 
 views::View* TilesDefaultView::GetHelpButtonView() const {
   return help_button_;
 }
 
 const views::CustomButton* TilesDefaultView::GetShutdownButtonViewForTest()
     const {
   return power_button_;
 }
 
 }  // namespace ash