Reland: mash: Convert TrayBackgroundView to wm common types

ash/system/tray/system_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/tray/system_tray.h"
 
 #include "ash/common/ash_switches.h"
 #include "ash/common/session/session_state_delegate.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/date/tray_date.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/system/tray/system_tray_item.h"
+#include "ash/common/system/tray/tray_bubble_wrapper.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray_accessibility.h"
 #include "ash/common/system/update/tray_update.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/cast/tray_cast.h"
 #include "ash/system/status_area_widget.h"
-#include "ash/system/tray/tray_bubble_wrapper.h"
 #include "ash/system/user/login_status.h"
 #include "ash/system/user/tray_user.h"
 #include "ash/system/user/tray_user_separator.h"
 #include "ash/system/web_notification/web_notification_tray.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/timer/timer.h"
 #include "grit/ash_strings.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 87 matching lines @@
   std::unique_ptr<TrayBubbleWrapper> bubble_wrapper_;
   bool is_persistent_;
 
   DISALLOW_COPY_AND_ASSIGN(SystemBubbleWrapper);
 };
 
 
 // SystemTray
 
 SystemTray::SystemTray(StatusAreaWidget* status_area_widget)
-    : TrayBackgroundView(status_area_widget),
+    : TrayBackgroundView(status_area_widget->wm_shelf()),
+      status_area_widget_(status_area_widget),
       items_(),
       detailed_item_(nullptr),
       default_bubble_height_(0),
       hide_notifications_(false),
       full_system_tray_menu_(false),
       tray_accessibility_(nullptr),
       tray_cast_(nullptr),
       tray_date_(nullptr),
       tray_update_(nullptr),
       screen_capture_tray_item_(nullptr),
       screen_share_tray_item_(nullptr) {
+  DCHECK(status_area_widget_);
   SetContentsBackground();
 }
 
 SystemTray::~SystemTray() {
   // Destroy any child views that might have back pointers before ~View().
   system_bubble_.reset();
   notification_bubble_.reset();
   for (std::vector<SystemTrayItem*>::iterator it = items_.begin();
        it != items_.end();
        ++it) {
@@ skipping 365 matching lines @@
     default_bubble_height_ = system_bubble_->bubble_view()->height();
 
   if (detailed && items.size() > 0)
     detailed_item_ = items[0];
   else
     detailed_item_ = NULL;
 
   UpdateNotificationBubble();  // State changed, re-create notifications.
   if (!notification_bubble_)
     UpdateWebNotifications();
-  GetShelf()->UpdateAutoHideState();
+  shelf()->UpdateAutoHideState();
 
   // When we show the system menu in our alternate shelf layout, we need to
   // tint the background.
   if (full_system_tray_menu_)
     SetDrawBackgroundAsActive(true);
 }
 
 void SystemTray::UpdateNotificationBubble() {
   // Only show the notification bubble if we have notifications.
   if (notification_items_.empty()) {
@@ skipping 50 matching lines @@
 
   int height = 0;
   if (bubble_view) {
     gfx::Rect work_area =
         display::Screen::GetScreen()
             ->GetDisplayNearestWindow(bubble_view->GetWidget()->GetNativeView())
             .work_area();
     height =
         std::max(0, work_area.height() - bubble_view->GetBoundsInScreen().y());
   }
-  status_area_widget()->web_notification_tray()->SetSystemTrayHeight(height);
+  status_area_widget_->web_notification_tray()->SetSystemTrayHeight(height);
 }
 
 base::string16 SystemTray::GetAccessibleTimeString(
     const base::Time& now) const {
   base::HourClockType hour_type =
       WmShell::Get()->system_tray_delegate()->GetHourClockType();
   return base::TimeFormatTimeOfDayWithHourClockType(
       now, hour_type, base::kKeepAmPm);
 }
 
@@ skipping 28 matching lines @@
 }
 
 void SystemTray::BubbleResized(const TrayBubbleView* bubble_view) {
   UpdateWebNotifications();
 }
 
 void SystemTray::HideBubbleWithView(const TrayBubbleView* bubble_view) {
   if (system_bubble_.get() && bubble_view == system_bubble_->bubble_view()) {
     DestroySystemBubble();
     UpdateNotificationBubble();  // State changed, re-create notifications.
-    GetShelf()->UpdateAutoHideState();
+    shelf()->UpdateAutoHideState();
   } else if (notification_bubble_.get() &&
              bubble_view == notification_bubble_->bubble_view()) {
     DestroyNotificationBubble();
   }
 }
 
 void SystemTray::ClickedOutsideBubble() {
   if (!system_bubble_ || system_bubble_->is_persistent())
     return;
   HideBubbleWithView(system_bubble_->bubble_view());
@@ skipping 107 matching lines @@
           .work_area()
           .height();
   if (work_area_height > 0) {
     UMA_HISTOGRAM_CUSTOM_COUNTS(
         "Ash.SystemMenu.PercentageOfWorkAreaHeightCoveredByMenu",
         100 * bubble_view->height() / work_area_height, 1, 300, 100);
   }
 }
 
 }  // namespace ash