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

ash/system/tray/tray_background_view.h

 // 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.
 
 #ifndef ASH_SYSTEM_TRAY_TRAY_BACKGROUND_VIEW_H_
 #define ASH_SYSTEM_TRAY_TRAY_BACKGROUND_VIEW_H_
 
 #include <memory>
 
 #include "ash/ash_export.h"
 #include "ash/common/shelf/shelf_types.h"
 #include "ash/common/system/tray/actionable_view.h"
 #include "ash/common/wm/background_animator.h"
 #include "base/macros.h"
 #include "ui/compositor/layer_animation_observer.h"
 #include "ui/views/bubble/tray_bubble_view.h"
 
 namespace ash {
 class ShelfLayoutManager;
 class StatusAreaWidget;
 class TrayEventFilter;
 class TrayBackground;
+class WmShelf;
 
 // Base class for children of StatusAreaWidget: SystemTray, WebNotificationTray,
 // LogoutButtonTray, OverviewButtonTray.
 // This class handles setting and animating the background when the Launcher
 // his shown/hidden. It also inherits from ActionableView so that the tray
 // items can override PerformAction when clicked on.
 class ASH_EXPORT TrayBackgroundView : public ActionableView,
                                       public BackgroundAnimatorDelegate,
                                       public ui::ImplicitAnimationObserver {
  public:
@@ skipping 100 matching lines @@
   StatusAreaWidget* status_area_widget() {
     return status_area_widget_;
   }
   const StatusAreaWidget* status_area_widget() const {
     return status_area_widget_;
   }
   TrayContainer* tray_container() const { return tray_container_; }
   ShelfAlignment shelf_alignment() const { return shelf_alignment_; }
   TrayEventFilter* tray_event_filter() { return tray_event_filter_.get(); }
 
-  ShelfLayoutManager* GetShelfLayoutManager();
+  WmShelf* GetShelf();
 
   // Updates the arrow visibility based on the launcher visibility.
   void UpdateBubbleViewArrow(views::TrayBubbleView* bubble_view);
 
  private:
   class TrayWidgetObserver;
 
   // Called from Initialize after all status area trays have been created.
   // Sets the border based on the position of the view.
   void SetTrayBorder();
 
   // ui::ImplicitAnimationObserver:
   void OnImplicitAnimationsCompleted() override;
   bool RequiresNotificationWhenAnimatorDestroyed() const override;
 
   // Applies transformations to the |layer()| to animate the view when
   // SetVisible(false) is called.
   void HideTransformation();
 
   // Unowned pointer to parent widget.
   StatusAreaWidget* status_area_widget_;
 
   // Convenience pointer to the contents view.
   TrayContainer* tray_container_;
 
   // Shelf alignment.
+  // TODO(jamescook): Don't cache this, get it from WmShelf.
   ShelfAlignment shelf_alignment_;
 
   // Owned by the view passed to SetContents().
   TrayBackground* background_;
 
   // This variable stores the activation override which will tint the background
   // differently if set to true.
   bool draw_background_as_active_;
 
   std::unique_ptr<TrayWidgetObserver> widget_observer_;
   std::unique_ptr<TrayEventFilter> tray_event_filter_;
 
   DISALLOW_COPY_AND_ASSIGN(TrayBackgroundView);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SYSTEM_TRAY_TRAY_BACKGROUND_VIEW_H_