mash: Convert WebNotificationTray to wm common types

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/common/ash_switches.h"
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/shelf/shelf_constants.h"
 #include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/shelf/wm_shelf_util.h"
-#include "ash/common/shell_window_ids.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray/tray_utils.h"
 #include "ash/common/wm_lookup.h"
 #include "ash/common/wm_root_window_controller.h"
+#include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
-#include "ash/shell.h"
 #include "ash/system/status_area_widget.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/tray_background_view.h"
 #include "ash/system/tray/tray_bubble_wrapper.h"
 #include "ash/system/web_notification/ash_popup_alignment_delegate.h"
 #include "base/auto_reset.h"
 #include "base/i18n/number_formatting.h"
 #include "base/i18n/rtl.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_task_runner_handle.h"
@@ skipping 184 matching lines @@
   SetContentsBackground();
   tray_container()->SetBorder(views::Border::NullBorder());
   message_center_tray_.reset(new message_center::MessageCenterTray(
       this,
       message_center::MessageCenter::Get()));
   WmShelf* shelf = WmLookup::Get()
                        ->GetWindowForWidget(status_area_widget)
                        ->GetRootWindowController()
                        ->GetShelf();
   popup_alignment_delegate_.reset(new AshPopupAlignmentDelegate(shelf));
-  // TODO(jamescook): Either MessagePopupCollection needs to become aware of
-  // mus or we need some sort of parent/container provider.
   popup_collection_.reset(new message_center::MessagePopupCollection(
-      ash::Shell::GetContainer(
-          status_area_widget->GetNativeView()->GetRootWindow(),
-          kShellWindowId_StatusContainer),
       message_center(),
       message_center_tray_.get(),
       popup_alignment_delegate_.get()));
   const display::Display& display = WmLookup::Get()
                                         ->GetWindowForWidget(status_area_widget)
                                         ->GetDisplayNearestWindow();
   popup_alignment_delegate_->StartObserving(display::Screen::GetScreen(),
                                             display);
   OnMessageCenterTrayChanged();
 }
@@ skipping 180 matching lines @@
 bool WebNotificationTray::ShowNotifierSettings() {
   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 {
-  LoginStatus login_status = status_area_widget()->login_status();
-  bool userAddingRunning = ash::Shell::GetInstance()
-                               ->session_state_delegate()
-                               ->IsInSecondaryLoginScreen();
-
-  return login_status != LoginStatus::NOT_LOGGED_IN && !userAddingRunning;
+  return IsLoggedIn();
 }
 
 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 42 matching lines @@
     return;
   should_update_tray_content_ = false;
 
   message_center::MessageCenter* message_center =
       message_center_tray_->message_center();
   button_->SetUnreadCount(message_center->UnreadNotificationCount());
   if (IsMessageCenterBubbleVisible())
     button_->SetState(views::CustomButton::STATE_PRESSED);
   else
     button_->SetState(views::CustomButton::STATE_NORMAL);
-  bool userAddingRunning = ash::Shell::GetInstance()
-                               ->session_state_delegate()
-                               ->IsInSecondaryLoginScreen();
 
-  SetVisible(
-      (status_area_widget()->login_status() != LoginStatus::NOT_LOGGED_IN) &&
-      !userAddingRunning);
+  SetVisible(IsLoggedIn());
   Layout();
   SchedulePaint();
 }
 
 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 status_area_widget()->login_status() != LoginStatus::NOT_LOGGED_IN &&

[msw, 2016/06/17 22:28:11]

q: Is it odd that this doesn't check for LoginStatus::LOCKED, etc?

[James Cook, 2016/06/17 23:46:33]

A little, but maybe you want notifications at the lock screen? I think we might
reuse these sorts of notifications for things like "screen extended to monitor".
Of course, that begs the question why we don't do it when adding a user.

It is odd, but in the absence of better understanding I don't want to change it.

[stevenjb, 2016/06/20 17:41:35]

Apparently elsewhere we hide the message center when the screen is locked.

FWIW, I don't think "LOCKED" should be part of LoginStatus, the concepts are at
least partly orthogonal. (And really I don't think we need/want
status_area_widget()->login_status() anymore, iirc it predates LoginState).

I also don't think this class should need to be aware of SessionStateDelegate
(which I'm not actually familiar with).

That said, i wouldn't change the logic in this CL.

[James Cook, 2016/06/20 18:05:10]

Acknowledged.

+         !WmShell::Get()->GetSessionStateDelegate()->IsInSecondaryLoginScreen();
+}
+
 // Methods for testing
 
 bool WebNotificationTray::IsPopupVisible() const {
   return message_center_tray_->popups_visible();
 }
 
 message_center::MessageCenterBubble*
 WebNotificationTray::GetMessageCenterBubbleForTest() {
   if (!message_center_bubble())
     return NULL;
   return static_cast<message_center::MessageCenterBubble*>(
       message_center_bubble()->bubble());
 }
 
 }  // namespace ash