mash: Break ash system tray dependencies on ash::ShelfWidget

ash/system/status_area_widget.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/status_area_widget.h"
 
+#include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/wm_root_window_controller.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
-#include "ash/shelf/shelf_layout_manager.h"
-#include "ash/shelf/shelf_widget.h"
-#include "ash/shell.h"
-#include "ash/shell_delegate.h"
 #include "ash/system/overview/overview_button_tray.h"
 #include "ash/system/status_area_widget_delegate.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/web_notification/web_notification_tray.h"
 #include "ash/wm/window_properties.h"
 #include "base/i18n/time_formatting.h"
 
 #if defined(OS_CHROMEOS)
 #include "ash/system/chromeos/session/logout_button_tray.h"
 #include "ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.h"
 #endif
 
 namespace ash {
 
 StatusAreaWidget::StatusAreaWidget(WmWindow* status_container,
-                                   ShelfWidget* shelf_widget)
+                                   WmShelf* wm_shelf)
     : status_area_widget_delegate_(new StatusAreaWidgetDelegate),
       overview_button_tray_(NULL),
       system_tray_(NULL),
       web_notification_tray_(NULL),
 #if defined(OS_CHROMEOS)
       logout_button_tray_(NULL),
       virtual_keyboard_tray_(NULL),
 #endif
       login_status_(LoginStatus::NOT_LOGGED_IN),
-      shelf_widget_(shelf_widget) {
+      wm_shelf_(wm_shelf) {
   views::Widget::InitParams params(
       views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
   params.delegate = status_area_widget_delegate_;
   params.name = "StatusAreaWidget";
   params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
   status_container->GetRootWindowController()
       ->ConfigureWidgetInitParamsForContainer(
           this, status_container->GetShellWindowId(), &params);
   Init(params);
   set_focus_on_creation(false);
@@ skipping 43 matching lines @@
   delete overview_button_tray_;
   overview_button_tray_ = NULL;
 }
 
 bool StatusAreaWidget::ShouldShowShelf() const {
   if ((system_tray_ && system_tray_->ShouldShowShelf()) ||
       (web_notification_tray_ &&
        web_notification_tray_->ShouldBlockShelfAutoHide()))
     return true;
 
-  if (!shelf_widget_->shelf()->IsVisible())
+  if (!wm_shelf_->IsVisible())
     return false;
 
   // If the shelf is currently visible, don't hide the shelf if the mouse
   // is in any of the notification bubbles.
   return (system_tray_ && system_tray_->IsMouseInNotificationBubble()) ||
          (web_notification_tray_ &&
           web_notification_tray_->IsMouseInNotificationBubble());
 }
 
 bool StatusAreaWidget::IsMessageBubbleShown() const {
@@ skipping 14 matching lines @@
 }
 
 void StatusAreaWidget::OnNativeWidgetActivationChanged(bool active) {
   Widget::OnNativeWidgetActivationChanged(active);
   if (active)
     status_area_widget_delegate_->SetPaneFocusAndFocusDefault();
 }
 
 void StatusAreaWidget::OnMouseEvent(ui::MouseEvent* event) {
   Widget::OnMouseEvent(event);
-  if (Shell::GetInstance()->in_mus() && shelf_widget_->shelf_layout_manager())
-    shelf_widget_->shelf_layout_manager()->UpdateAutoHideForMouseEvent(event);
+  wm_shelf_->UpdateAutoHideForMouseEvent(event);
 }
 
 void StatusAreaWidget::OnGestureEvent(ui::GestureEvent* event) {
   Widget::OnGestureEvent(event);
-  if (Shell::GetInstance()->in_mus() && shelf_widget_->shelf_layout_manager())
-    shelf_widget_->shelf_layout_manager()->UpdateAutoHideForGestureEvent(event);
+  wm_shelf_->UpdateAutoHideForGestureEvent(event);
 }
 
 void StatusAreaWidget::AddSystemTray() {
   system_tray_ = new SystemTray(this);
   status_area_widget_delegate_->AddTray(system_tray_);
 }
 
 void StatusAreaWidget::AddWebNotificationTray() {
   web_notification_tray_ = new WebNotificationTray(this);
   status_area_widget_delegate_->AddTray(web_notification_tray_);
@@ skipping 48 matching lines @@
     web_notification_tray_->UpdateAfterLoginStatusChange(login_status);
 #if defined(OS_CHROMEOS)
   if (logout_button_tray_)
     logout_button_tray_->UpdateAfterLoginStatusChange(login_status);
 #endif
   if (overview_button_tray_)
     overview_button_tray_->UpdateAfterLoginStatusChange(login_status);
 }
 
 }  // namespace ash