mash: Convert TrayBackgroundView 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/system_tray_delegate.h"
+#include "ash/common/system/tray/tray_background_view.h"

[msw, 2016/06/23 22:17:27]

nit: not needed (included by header)

[James Cook, 2016/06/23 22:44:18]

Done.

+#include "ash/common/system/tray/tray_bubble_wrapper.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/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"
 #include "grit/ash_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
@@ skipping 164 matching lines @@
   bool is_bubble_visible_;
   int unread_count_;
 
   views::ImageView no_unread_icon_;
   views::Label unread_label_;
 
   DISALLOW_COPY_AND_ASSIGN(WebNotificationButton);
 };
 
 WebNotificationTray::WebNotificationTray(StatusAreaWidget* status_area_widget)
-    : TrayBackgroundView(status_area_widget),
+    : TrayBackgroundView(status_area_widget->wm_shelf()),
+      status_area_widget_(status_area_widget),
       button_(NULL),
       show_message_center_on_unlock_(false),
       should_update_tray_content_(false),
       should_block_shelf_auto_hide_(false) {
+  DCHECK(status_area_widget_);
   button_ = new WebNotificationButton(this);
   button_->set_triggerable_event_flags(
       ui::EF_LEFT_MOUSE_BUTTON | ui::EF_RIGHT_MOUSE_BUTTON);
   tray_container()->AddChildView(button_);
   SetContentsBackground();
   tray_container()->SetBorder(views::Border::NullBorder());
   message_center_tray_.reset(new message_center::MessageCenterTray(
       this,
       message_center::MessageCenter::Get()));
   WmShelf* shelf = WmLookup::Get()
@@ skipping 26 matching lines @@
   if (!ShouldShowMessageCenter())
     return false;
 
   should_block_shelf_auto_hide_ = true;
   message_center::MessageCenterBubble* message_center_bubble =
       new message_center::MessageCenterBubble(
           message_center(),
           message_center_tray_.get(),
           true);
 
-  WmShelf* shelf = GetShelf();
   int max_height;
-  if (IsHorizontalAlignment(shelf->GetAlignment())) {
-    max_height = shelf->GetIdealBounds().y();
+  if (IsHorizontalAlignment(shelf()->GetAlignment())) {
+    max_height = shelf()->GetIdealBounds().y();
   } else {
     // Assume the status area and bubble bottoms are aligned when vertical.
     WmWindow* status_area_window =
-        WmLookup::Get()->GetWindowForWidget(status_area_widget());
+        WmLookup::Get()->GetWindowForWidget(status_area_widget_);
     gfx::Rect bounds_in_root =
         status_area_window->GetRootWindow()->ConvertRectFromScreen(
             status_area_window->GetBoundsInScreen());
     max_height = bounds_in_root.bottom();
   }
   message_center_bubble->SetMaxHeight(
       std::max(0, max_height - GetTrayConstant(TRAY_SPACING)));
   if (show_settings)
     message_center_bubble->SetSettingsVisible();
   message_center_bubble_.reset(
       new WebNotificationBubbleWrapper(this, message_center_bubble));
 
-  status_area_widget()->SetHideSystemNotifications(true);
-  shelf->UpdateAutoHideState();
+  status_area_widget_->SetHideSystemNotifications(true);
+  shelf()->UpdateAutoHideState();
   button_->SetBubbleVisible(true);
   SetDrawBackgroundAsActive(true);
   return true;
 }
 
 bool WebNotificationTray::ShowMessageCenter() {
   return ShowMessageCenterInternal(false /* show_settings */);
 }
 
 void WebNotificationTray::HideMessageCenter() {
   if (!message_center_bubble())
     return;
   SetDrawBackgroundAsActive(false);
   message_center_bubble_.reset();
   should_block_shelf_auto_hide_ = false;
   show_message_center_on_unlock_ = false;
-  status_area_widget()->SetHideSystemNotifications(false);
-  GetShelf()->UpdateAutoHideState();
+  status_area_widget_->SetHideSystemNotifications(false);
+  shelf()->UpdateAutoHideState();
   button_->SetBubbleVisible(false);
 }
 
 void WebNotificationTray::SetSystemTrayHeight(int height) {
   popup_alignment_delegate_->SetSystemTrayHeight(height);
 }
 
 int WebNotificationTray::system_tray_height_for_test() const {
   return popup_alignment_delegate_->system_tray_height_for_test();
 }
 
 bool WebNotificationTray::ShowPopups() {
   if (message_center_bubble())
     return false;
 
   popup_collection_->DoUpdateIfPossible();
   return true;
 }
 
 void WebNotificationTray::HidePopups() {
   DCHECK(popup_collection_.get());
   popup_collection_->MarkAllPopupsShown();
 }
 
 // Private methods.
 
 bool WebNotificationTray::ShouldShowMessageCenter() {
-  return !(status_area_widget()->system_tray() &&
-           status_area_widget()->system_tray()->HasNotificationBubble());
+  return !(status_area_widget_->system_tray() &&
+           status_area_widget_->system_tray()->HasNotificationBubble());
 }
 
 bool WebNotificationTray::ShouldBlockShelfAutoHide() const {
   return should_block_shelf_auto_hide_;
 }
 
 bool WebNotificationTray::IsMessageCenterBubbleVisible() const {
   return (message_center_bubble() &&
           message_center_bubble()->bubble()->IsVisible());
 }
@@ skipping 174 matching lines @@
     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 &&
-         !WmShell::Get()->GetSessionStateDelegate()->IsInSecondaryLoginScreen();
+  WmShell* shell = WmShell::Get();
+  // TODO(jamescook): Should this also check LoginState::LOCKED?
+  return shell->system_tray_delegate()->GetUserLoginStatus() !=
+             LoginStatus::NOT_LOGGED_IN &&
+         !shell->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