mash: Fix crash when clicking on the shelf overflow icon

ash/shelf/overflow_bubble.cc

 // Copyright 2013 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/shelf/overflow_bubble.h"
 
-#include "ash/root_window_controller.h"
 #include "ash/shelf/overflow_bubble_view.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_view.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
-#include "ash/system/tray/system_tray.h"
+#include "ash/system/tray/tray_background_view.h"
 #include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/events/event.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 
 OverflowBubble::OverflowBubble()
     : bubble_(NULL),
       anchor_(NULL),
       shelf_view_(NULL) {
 }
 
 OverflowBubble::~OverflowBubble() {
   Hide();
 }
 
 void OverflowBubble::Show(views::View* anchor, ShelfView* shelf_view) {
   Hide();
 
   bubble_ = new OverflowBubbleView();
   bubble_->InitOverflowBubble(anchor, shelf_view);
   shelf_view_ = shelf_view;
   anchor_ = anchor;
 
+  // TODO(jamescook): Change this to a PointerWatcher.
   Shell::GetInstance()->AddPreTargetHandler(this);
 
-  RootWindowController::ForWindow(anchor->GetWidget()->GetNativeView())->
-      GetSystemTray()->InitializeBubbleAnimations(bubble_->GetWidget());
+  TrayBackgroundView::InitializeBubbleAnimations(bubble_->GetWidget());
   bubble_->GetWidget()->AddObserver(this);
   bubble_->GetWidget()->Show();
 }
 
 void OverflowBubble::Hide() {
   if (!IsShowing())
     return;
 
   Shell::GetInstance()->RemovePreTargetHandler(this);
   bubble_->GetWidget()->RemoveObserver(this);
@@ skipping 38 matching lines @@
 
 void OverflowBubble::OnWidgetDestroying(views::Widget* widget) {
   DCHECK(widget == bubble_->GetWidget());
   bubble_ = NULL;
   anchor_ = NULL;
   shelf_view_->shelf()->SchedulePaint();
   shelf_view_ = NULL;
 }
 
 }  // namespace ash