chromeos: Rename ash::WmShelf to Shelf

ash/shelf/overflow_button.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_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"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image_skia_operations.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/gfx/skbitmap_operations.h"
 #include "ui/views/animation/flood_fill_ink_drop_ripple.h"
 #include "ui/views/animation/ink_drop_impl.h"
 #include "ui/views/animation/ink_drop_mask.h"
 
 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_);
 
   SetInkDropMode(InkDropMode::ON);
   set_ink_drop_base_color(kShelfInkDropBaseColor);
   set_ink_drop_visible_opacity(kShelfInkDropVisibleOpacity);
   set_hide_ink_drop_when_showing_context_menu(false);
 
   SetFocusBehavior(FocusBehavior::ACCESSIBLE_ONLY);
   SetAccessibleName(l10n_util::GetStringUTF16(IDS_ASH_SHELF_OVERFLOW_NAME));
@@ skipping 16 matching lines @@
   AnimateInkDrop(views::InkDropState::DEACTIVATED, nullptr);
   UpdateChevronImage();
 }
 
 void OverflowButton::UpdateShelfItemBackground(SkColor color) {
   background_color_ = color;
   SchedulePaint();
 }
 
 OverflowButton::ChevronDirection OverflowButton::GetChevronDirection() const {
-  switch (wm_shelf_->GetAlignment()) {
+  switch (shelf_->alignment()) {
     case SHELF_ALIGNMENT_LEFT:
       if (shelf_view_->IsShowingOverflowBubble())
         return ChevronDirection::LEFT;
       return ChevronDirection::RIGHT;
     case SHELF_ALIGNMENT_RIGHT:
       if (shelf_view_->IsShowingOverflowBubble())
         return ChevronDirection::RIGHT;
       return ChevronDirection::LEFT;
     default:
       if (shelf_view_->IsShowingOverflowBubble())
@@ skipping 83 matching lines @@
 void OverflowButton::PaintForeground(gfx::Canvas* canvas,
                                      const gfx::Rect& bounds) {
   DCHECK(chevron_image_);
   canvas->DrawImageInt(
       *chevron_image_,
       bounds.x() + ((bounds.width() - chevron_image_->width()) / 2),
       bounds.y() + ((bounds.height() - chevron_image_->height()) / 2));
 }
 
 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.
   const int inset = (kShelfSize - kOverflowButtonSize) / 2;
   const int x = alignment == SHELF_ALIGNMENT_LEFT
                     ? content_bounds.right() - inset - kOverflowButtonSize
                     : content_bounds.x() + inset;
   return gfx::Rect(x, content_bounds.y() + inset, kOverflowButtonSize,
                    kOverflowButtonSize);
 }
 
 }  // namespace ash