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

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_window.h"
-#include "ash/shelf/shelf_layout_manager.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"
@@ skipping 222 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(GetShelfLayoutManager()->GetAlignment())) {
-    max_height = GetShelfLayoutManager()->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());
     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);
-  GetShelfLayoutManager()->UpdateAutoHideState();
+  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);
-  GetShelfLayoutManager()->UpdateAutoHideState();
+  GetShelf()->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();
 }
@@ skipping 215 matching lines @@
 
 message_center::MessageCenterBubble*
 WebNotificationTray::GetMessageCenterBubbleForTest() {
   if (!message_center_bubble())
     return NULL;
   return static_cast<message_center::MessageCenterBubble*>(
       message_center_bubble()->bubble());
 }
 
 }  // namespace ash