[Night Light] CL2: Ash and system tray work

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"
 #include "ash/shell_port.h"
 #include "ash/shutdown_controller.h"
 #include "ash/strings/grit/ash_strings.h"
+#include "ash/system/night_light/night_light_controller.h"
 #include "ash/system/tray/system_menu_button.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_controller.h"
 #include "ash/system/tray/system_tray_item.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_popup_utils.h"
 #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"
@@ skipping 10 matching lines @@
 const char kHebrewLocale[] = "he";
 
 }  // 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_);
 }
 
 TilesDefaultView::~TilesDefaultView() = default;
 
 void TilesDefaultView::Init() {
   views::BoxLayout* box_layout =
       new views::BoxLayout(views::BoxLayout::kHorizontal, 4, 0, 0);
@@ skipping 24 matching lines @@
     // 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);
   }
   if (disable_buttons)
     help_button_->SetEnabled(false);
   AddChildView(help_button_);
   AddChildView(TrayPopupUtils::CreateVerticalSeparator());
 
+  night_light_button_ = new SystemMenuButton(
+      this, TrayPopupInkDropStyle::HOST_CENTERED,
+      ash::Shell::Get()->night_light_controller()->enabled()

[James Cook, 2017/05/05 17:12:32]

nit: no ash::

[afakhry, 2017/05/05 20:04:12]

Done.

+          ? kSystemMenuNightLightOnIcon
+          : kSystemMenuNightLightOffIcon,
+      IDS_ASH_STATUS_TRAY_NIGHT_LIGHT);
+  night_light_button_->SetEnabled(!disable_buttons);

[James Cook, 2017/05/05 17:12:32]

Is this button going to be a toggle, or will it open WebUI settings?

If the former, this should not use |disable_buttons|.

[afakhry, 2017/05/05 20:04:12]

It's a toggle button, but this |disable_buttons| is still needed because before
login, it makes all these buttons disabled and grayed out.

[James Cook, 2017/05/05 20:47:43]

|disable_buttons| currently means "I can show webui settings". It only sort-of
means you're at the login screen - there are lots of other cases where it is
true.

I suggest renaming |disable_buttons| to |can_show_webui| and inversing the
logic, then adding the conditional you really mean here (maybe
SessionController::IsActiveUserSession, IsScreenLocked, or some combination
thereof).

If you really want CanOpenWebUISettings you need a comment explaining why you're
using that even though the button does not open webui, and/or rename the
CanOpenWebUISettings method.

[afakhry, 2017/05/06 00:49:34]

According to this comment:
https://cs.chromium.org/chromium/src/ash/system/tiles/tiles_default_view.cc?t...
One can't open WebUI Settings in login screen, lock screen, or secondary account
flow. If that's true, it's also what we want for the Night Light toggle button;
we want it disabled in all the above situations. 

I modified |disabled_buttons| to |can_show_web_ui| as requested.

Do I still need to check IsActiveUserSession() or IsScreenLocked() etc? It seems
from the above comment that |can_show_web_ui| is enough.

+  AddChildView(night_light_button_);
+  AddChildView(TrayPopupUtils::CreateVerticalSeparator());

[James Cook, 2017/05/05 17:12:32]

Please add a test that the night light icon is created in the correct state. For
example, see TrayTilesTest.

[afakhry, 2017/05/05 20:04:12]

Done. I updated TrayTilesTest.

+
   lock_button_ =
       new SystemMenuButton(this, TrayPopupInkDropStyle::HOST_CENTERED,
                            kSystemMenuLockIcon, IDS_ASH_STATUS_TRAY_LOCK);
   if (disable_buttons || !Shell::Get()->session_controller()->CanLockScreen())
     lock_button_->SetEnabled(false);
 
   AddChildView(lock_button_);
   AddChildView(TrayPopupUtils::CreateVerticalSeparator());
 
   power_button_ =
       new SystemMenuButton(this, TrayPopupInkDropStyle::HOST_CENTERED,
                            kSystemMenuPowerIcon, IDS_ASH_STATUS_TRAY_SHUTDOWN);
   AddChildView(power_button_);
   // This object is recreated every time the menu opens. Don't bother updating
   // the tooltip if the shutdown policy changes while the menu is open.
   bool reboot = Shell::Get()->shutdown_controller()->reboot_on_shutdown();
   power_button_->SetTooltipText(l10n_util::GetStringUTF16(
       reboot ? IDS_ASH_STATUS_TRAY_REBOOT : IDS_ASH_STATUS_TRAY_SHUTDOWN));
 }
 
 void TilesDefaultView::ButtonPressed(views::Button* sender,
                                      const ui::Event& event) {
   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();
   } 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