cros: Use SessionController to enable system tray settings / notifications tray

ash/system/web_notification/web_notification_tray.cc

 // Copyright (c) 2012 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/web_notification/web_notification_tray.h"
 
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/resources/vector_icons/vector_icons.h"
 #include "ash/root_window_controller.h"
 #include "ash/session/session_controller.h"
@@ skipping 377 matching lines @@
   return true;
 }
 
 void WebNotificationTray::HidePopups() {
   DCHECK(popup_collection_.get());
   popup_collection_->MarkAllPopupsShown();
 }
 
 // Private methods.
 
-bool WebNotificationTray::ShouldShowMessageCenter() {
-  return Shell::Get()->system_tray_delegate()->ShouldShowNotificationTray();
+bool WebNotificationTray::ShouldShowMessageCenter() const {
+  // Hidden at login screen, during supervised user creation, etc.
+  return Shell::Get()->session_controller()->ShouldShowNotificationTray();
 }
 
 bool WebNotificationTray::ShouldBlockShelfAutoHide() const {
   return should_block_shelf_auto_hide_;
 }
 
 bool WebNotificationTray::IsMessageCenterBubbleVisible() const {
   return (message_center_bubble() &&
           message_center_bubble()->bubble()->IsVisible());
 }
@@ skipping 79 matching lines @@
   if (message_center_bubble()) {
     static_cast<message_center::MessageCenterBubble*>(
         message_center_bubble()->bubble())
         ->SetSettingsVisible();
     return true;
   }
   return ShowMessageCenterInternal(true /* show_settings */);
 }
 
 bool WebNotificationTray::IsContextMenuEnabled() const {
-  return IsLoggedIn();
+  return ShouldShowMessageCenter();

[James Cook, 2017/04/17 23:21:13]

This was probably wrong before. The context menu contains a "Settings..." item,
which we should not show in supervised user flow, etc.

[xiyuan, 2017/04/18 16:26:29]

Acknowledged.

 }
 
 message_center::MessageCenterTray* WebNotificationTray::GetMessageCenterTray() {
   return message_center_tray_.get();
 }
 
 bool WebNotificationTray::IsCommandIdChecked(int command_id) const {
   if (command_id != kToggleQuietMode)
     return false;
   return message_center()->IsQuietMode();
@@ skipping 75 matching lines @@
       visible_notification_count - visible_small_icon_count;
   if (hidden_icon_count != 0) {
     counter_->SetVisible(true);
     counter_->SetNotificationCount(
         (visible_small_icon_count != 0),  // small_icons_exist
         hidden_icon_count);
   } else {
     counter_->SetVisible(false);
   }
 
-  SetVisible(IsLoggedIn() && ShouldShowMessageCenter());
+  SetVisible(ShouldShowMessageCenter());
   PreferredSizeChanged();
   Layout();
   SchedulePaint();
-  if (IsLoggedIn())
+  if (ShouldShowMessageCenter())

[James Cook, 2017/04/17 23:21:13]

It seemed weird to SetNextFocusableView() if |this| isn't visible. Also, I can't
get keyboard focus onto the tray icon no matter what I do -- Alt-Shift-N opens
the notifications menu, and Alt-Shift-S opens the status tray, and Alt-Shift-L
focuses the shelf, but I can't put focus on the icon. This might be dead code,
but I decided to keep it just in case.

[xiyuan, 2017/04/18 16:26:29]

Acknowledged.

     system_tray_->SetNextFocusableView(this);
 }
 
 void WebNotificationTray::ClickedOutsideBubble() {
   // Only hide the message center
   if (!message_center_bubble())
     return;
 
   message_center_tray_->HideMessageCenterBubble();
 }
 
 message_center::MessageCenter* WebNotificationTray::message_center() const {
   return message_center_tray_->message_center();
 }
 
-bool WebNotificationTray::IsLoggedIn() const {
-  return Shell::Get()->system_tray_delegate()->GetUserLoginStatus() !=
-             LoginStatus::NOT_LOGGED_IN &&
-         !Shell::Get()->session_controller()->IsInSecondaryLoginScreen();
-}
-
 // Methods for testing
 
 bool WebNotificationTray::IsPopupVisible() const {
   return message_center_tray_->popups_visible();
 }
 
 message_center::MessageCenterBubble*
 WebNotificationTray::GetMessageCenterBubbleForTest() {
   if (!message_center_bubble())
     return nullptr;
   return static_cast<message_center::MessageCenterBubble*>(
       message_center_bubble()->bubble());
 }
 
 }  // namespace ash