| Index: ash/shelf/overflow_button.cc
 | 
| diff --git a/ash/shelf/overflow_button.cc b/ash/shelf/overflow_button.cc
 | 
| index 9f4a414cf79c7dc138240ab58b377e03e9ce5de1..0b96ec9fe13614759982479d6f7ef7955196aecb 100644
 | 
| --- a/ash/shelf/overflow_button.cc
 | 
| +++ b/ash/shelf/overflow_button.cc
 | 
| @@ -5,9 +5,9 @@
 | 
|  #include "ash/shelf/overflow_button.h"
 | 
|  
 | 
|  #include "ash/resources/vector_icons/vector_icons.h"
 | 
| +#include "ash/shelf/shelf.h"
 | 
|  #include "ash/shelf/shelf_constants.h"
 | 
|  #include "ash/shelf/shelf_view.h"
 | 
| -#include "ash/shelf/wm_shelf.h"
 | 
|  #include "ash/strings/grit/ash_strings.h"
 | 
|  #include "base/memory/ptr_util.h"
 | 
|  #include "ui/base/l10n/l10n_util.h"
 | 
| @@ -21,12 +21,12 @@
 | 
|  
 | 
|  namespace ash {
 | 
|  
 | 
| -OverflowButton::OverflowButton(ShelfView* shelf_view, WmShelf* wm_shelf)
 | 
| +OverflowButton::OverflowButton(ShelfView* shelf_view, Shelf* shelf)
 | 
|      : CustomButton(nullptr),
 | 
|        upward_image_(gfx::CreateVectorIcon(kShelfOverflowIcon, kShelfIconColor)),
 | 
|        chevron_image_(nullptr),
 | 
|        shelf_view_(shelf_view),
 | 
| -      wm_shelf_(wm_shelf),
 | 
| +      shelf_(shelf),
 | 
|        background_color_(kShelfDefaultBaseColor) {
 | 
|    DCHECK(shelf_view_);
 | 
|  
 | 
| @@ -63,7 +63,7 @@ void OverflowButton::UpdateShelfItemBackground(SkColor color) {
 | 
|  }
 | 
|  
 | 
|  OverflowButton::ChevronDirection OverflowButton::GetChevronDirection() const {
 | 
| -  switch (wm_shelf_->GetAlignment()) {
 | 
| +  switch (shelf_->alignment()) {
 | 
|      case SHELF_ALIGNMENT_LEFT:
 | 
|        if (shelf_view_->IsShowingOverflowBubble())
 | 
|          return ChevronDirection::LEFT;
 | 
| @@ -167,7 +167,7 @@ void OverflowButton::PaintForeground(gfx::Canvas* canvas,
 | 
|  }
 | 
|  
 | 
|  gfx::Rect OverflowButton::CalculateButtonBounds() const {
 | 
| -  ShelfAlignment alignment = wm_shelf_->GetAlignment();
 | 
| +  ShelfAlignment alignment = shelf_->alignment();
 | 
|    gfx::Rect content_bounds = GetContentsBounds();
 | 
|    // Align the button to the top of a bottom-aligned shelf, to the right edge
 | 
|    // a left-aligned shelf, and to the left edge of a right-aligned shelf.
 | 
| 
 |