mash: Convert ash shelf overflow bubble to wm common types

ash/common/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/common/shelf/overflow_bubble.h"
 
+#include "ash/common/shelf/overflow_bubble_view.h"
+#include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/system/tray/tray_background_view.h"
-#include "ash/shelf/overflow_bubble_view.h"
-#include "ash/shelf/shelf.h"
+#include "ash/common/wm_shell.h"
 #include "ash/shelf/shelf_view.h"
-#include "ash/shelf/shelf_widget.h"
-#include "ash/shell.h"
-#include "ui/events/event.h"
+#include "ui/gfx/geometry/rect.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 
-OverflowBubble::OverflowBubble()
-    : bubble_(NULL), anchor_(NULL), shelf_view_(NULL) {
-  Shell::GetInstance()->AddPointerWatcher(this);
+OverflowBubble::OverflowBubble(WmShelf* wm_shelf)
+    : wm_shelf_(wm_shelf),
+      bubble_(nullptr),
+      anchor_(nullptr),
+      shelf_view_(nullptr) {
+  WmShell::Get()->AddPointerWatcher(this);
 }
 
 OverflowBubble::~OverflowBubble() {
   Hide();
-  Shell::GetInstance()->RemovePointerWatcher(this);
+  WmShell::Get()->RemovePointerWatcher(this);
 }
 
 void OverflowBubble::Show(views::View* anchor, ShelfView* shelf_view) {
   Hide();
 
-  bubble_ = new OverflowBubbleView();
+  bubble_ = new OverflowBubbleView(wm_shelf_);
   bubble_->InitOverflowBubble(anchor, shelf_view);
   shelf_view_ = shelf_view;
   anchor_ = anchor;
 
   TrayBackgroundView::InitializeBubbleAnimations(bubble_->GetWidget());
   bubble_->GetWidget()->AddObserver(this);
   bubble_->GetWidget()->Show();
 }
 
 void OverflowBubble::Hide() {
@@ skipping 36 matching lines @@
 void OverflowBubble::OnTouchPressed(const ui::TouchEvent& event,
                                     const gfx::Point& location_in_screen,
                                     views::Widget* target) {
   ProcessPressedEvent(location_in_screen);
 }
 
 void OverflowBubble::OnWidgetDestroying(views::Widget* widget) {
   DCHECK(widget == bubble_->GetWidget());
   bubble_ = NULL;
   anchor_ = NULL;
-  shelf_view_->shelf()->SchedulePaint();
+  wm_shelf_->SchedulePaint();
   shelf_view_ = NULL;
 }
 
 }  // namespace ash