Index: ash/system/tiles/tiles_default_view.cc |
diff --git a/ash/system/tiles/tiles_default_view.cc b/ash/system/tiles/tiles_default_view.cc |
index dbb5fd4bf28fb12f7df427cfc16433af4563a08a..6a47922009e57f82dcec02116f36cc3ca0533c85 100644 |
--- a/ash/system/tiles/tiles_default_view.cc |
+++ b/ash/system/tiles/tiles_default_view.cc |
@@ -86,10 +86,12 @@ void TilesDefaultView::Init() { |
AddChildView(help_button_); |
AddChildView(TrayPopupUtils::CreateVerticalSeparator()); |
- night_light_button_ = new NightLightToggleButton(this); |
- night_light_button_->SetEnabled(can_show_web_ui); |
- AddChildView(night_light_button_); |
- AddChildView(TrayPopupUtils::CreateVerticalSeparator()); |
+ if (NightLightController::IsFeatureEnabled()) { |
+ night_light_button_ = new NightLightToggleButton(this); |
+ night_light_button_->SetEnabled(can_show_web_ui); |
+ AddChildView(night_light_button_); |
+ AddChildView(TrayPopupUtils::CreateVerticalSeparator()); |
+ } |
lock_button_ = |
new SystemMenuButton(this, TrayPopupInkDropStyle::HOST_CENTERED, |
@@ -120,7 +122,8 @@ void TilesDefaultView::ButtonPressed(views::Button* sender, |
} else if (sender == help_button_) { |
ShellPort::Get()->RecordUserMetricsAction(UMA_TRAY_HELP); |
Shell::Get()->system_tray_controller()->ShowHelp(); |
- } else if (sender == night_light_button_) { |
+ } else if (NightLightController::IsFeatureEnabled() && |
+ sender == night_light_button_) { |
ShellPort::Get()->RecordUserMetricsAction(UMA_TRAY_NIGHT_LIGHT); |
Shell::Get()->night_light_controller()->Toggle(); |
night_light_button_->Update(); |