Index: ash/shelf/overflow_bubble.cc |
diff --git a/ash/shelf/overflow_bubble.cc b/ash/shelf/overflow_bubble.cc |
index 54f50cd303b72c9dd4924d71097e4e8f9de6ed2f..d9f0afe37bc4f7e283d35cfe08ab9d2f9f91613e 100644 |
--- a/ash/shelf/overflow_bubble.cc |
+++ b/ash/shelf/overflow_bubble.cc |
@@ -6,8 +6,8 @@ |
#include "ash/shelf/overflow_bubble_view.h" |
#include "ash/shelf/overflow_button.h" |
+#include "ash/shelf/shelf.h" |
#include "ash/shelf/shelf_view.h" |
-#include "ash/shelf/wm_shelf.h" |
#include "ash/shell_port.h" |
#include "ash/system/tray/tray_background_view.h" |
#include "ui/gfx/geometry/rect.h" |
@@ -15,12 +15,12 @@ |
namespace ash { |
-OverflowBubble::OverflowBubble(WmShelf* wm_shelf) |
- : wm_shelf_(wm_shelf), |
+OverflowBubble::OverflowBubble(Shelf* shelf) |
+ : shelf_(shelf), |
bubble_(nullptr), |
overflow_button_(nullptr), |
shelf_view_(nullptr) { |
- DCHECK(wm_shelf_); |
+ DCHECK(shelf_); |
ShellPort::Get()->AddPointerWatcher(this, |
views::PointerWatcherEventTypes::BASIC); |
} |
@@ -37,7 +37,7 @@ void OverflowBubble::Show(OverflowButton* overflow_button, |
Hide(); |
- bubble_ = new OverflowBubbleView(wm_shelf_); |
+ bubble_ = new OverflowBubbleView(shelf_); |
bubble_->InitOverflowBubble(overflow_button, shelf_view); |
shelf_view_ = shelf_view; |
overflow_button_ = overflow_button; |