Remove Shell::shelf()|status_area_widget()|launcher()

ash/system/tray/tray_background_view.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/tray_background_view.h"
 
 #include "ash/launcher/background_animator.h"
+#include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/status_area_widget.h"
 #include "ash/system/status_area_widget_delegate.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/wm/window_animations.h"
 #include "ui/aura/event_filter.h"
 #include "ui/aura/window.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/compositor/layer_animation_observer.h"
@@ skipping 229 matching lines @@
   background_ = new internal::TrayBackground;
   tray_container_->set_background(background_);
 }
 
 void TrayBackgroundView::SetPaintsBackground(
       bool value,
       internal::BackgroundAnimator::ChangeType change_type) {
   hide_background_animator_.SetPaintsBackground(value, change_type);
 }
 
+ShelfLayoutManager* TrayBackgroundView::GetShelfLayoutManager() {
+  return
+      RootWindowController::ForLauncher(GetWidget()->GetNativeView())->shelf();
+}
+
 void TrayBackgroundView::SetShelfAlignment(ShelfAlignment alignment) {
   shelf_alignment_ = alignment;
   SetBorder();
   tray_container_->SetAlignment(alignment);
 }
 
 void TrayBackgroundView::SetBorder() {
   views::View* parent = status_area_widget_->status_area_widget_delegate();
   // Tray views are laid out right-to-left or bottom-to-top
   int on_edge = (this == parent->child_at(0));
@@ skipping 88 matching lines @@
       return TrayBubbleView::ANCHOR_ALIGNMENT_LEFT;
     case SHELF_ALIGNMENT_RIGHT:
       return TrayBubbleView::ANCHOR_ALIGNMENT_RIGHT;
   }
   NOTREACHED();
   return TrayBubbleView::ANCHOR_ALIGNMENT_BOTTOM;
 }
 
 }  // namespace internal
 }  // namespace ash