[Launcher per display] Removed Shell::status_area_widget(), system_tray()

ash/launcher/overflow_bubble.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/launcher/overflow_bubble.h"
 
 #include <algorithm>
 
 #include "ash/launcher/launcher_types.h"
 #include "ash/launcher/launcher_view.h"
+#include "ash/root_window_controller.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/shell.h"
 #include "ash/wm/shelf_layout_manager.h"
+#include "ui/aura/root_window.h"
 #include "ui/gfx/insets.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/bubble/bubble_delegate.h"
 #include "ui/views/bubble/bubble_frame_view.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 namespace internal {
 
 namespace {
@@ skipping 227 matching lines @@
                           int overflow_start_index) {
   Hide();
 
   OverflowBubbleView* bubble_view = new OverflowBubbleView();
   bubble_view->InitOverflowBubble(delegate,
                                   model,
                                   anchor,
                                   overflow_start_index);
 
   bubble_ = bubble_view;
-  ash::Shell::GetInstance()->system_tray()->InitializeBubbleAnimations(
-      bubble_->GetWidget());
+  RootWindowController::ForWindow(anchor->GetWidget()->GetNativeView())->
+      GetSystemTray()->InitializeBubbleAnimations(bubble_->GetWidget());
   bubble_->GetWidget()->AddObserver(this);
   bubble_->GetWidget()->Show();
 }
 
 void OverflowBubble::Hide() {
   if (!IsShowing())
     return;
 
   bubble_->GetWidget()->RemoveObserver(this);
   bubble_->GetWidget()->Close();
   bubble_ = NULL;
 }
 
 void OverflowBubble::OnWidgetClosing(views::Widget* widget) {
   DCHECK(widget == bubble_->GetWidget());
   bubble_ = NULL;
 }
 
 }  // namespace internal
 }  // namespace ash