chromeos: Rename ash::WmShelf to Shelf

ash/system/tray/tray_background_view.cc

 // Copyright (c) 2012 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/system/tray/tray_background_view.h"
 
 #include <algorithm>
 
 #include "ash/ash_constants.h"
+#include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_constants.h"
-#include "ash/shelf/wm_shelf.h"
 #include "ash/shell.h"
 #include "ash/system/status_area_widget_delegate.h"
 #include "ash/system/tray/system_tray_notifier.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_container.h"
 #include "ash/system/tray/tray_event_filter.h"
 #include "base/memory/ptr_util.h"
 #include "ui/accessibility/ax_node_data.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/layer_animation_element.h"
@@ skipping 102 matching lines @@
   TrayBackgroundView* tray_background_view_;
 
   SkColor color_;
 
   DISALLOW_COPY_AND_ASSIGN(TrayBackground);
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // TrayBackgroundView
 
-TrayBackgroundView::TrayBackgroundView(WmShelf* wm_shelf)
+TrayBackgroundView::TrayBackgroundView(Shelf* shelf)
     // Note the ink drop style is ignored.
     : ActionableView(nullptr, TrayPopupInkDropStyle::FILL_BOUNDS),
-      wm_shelf_(wm_shelf),
-      tray_container_(new TrayContainer(wm_shelf)),
+      shelf_(shelf),
+      tray_container_(new TrayContainer(shelf)),
       background_(new TrayBackground(this)),
       is_active_(false),
       separator_visible_(true),
       widget_observer_(new TrayWidgetObserver(this)) {
-  DCHECK(wm_shelf_);
+  DCHECK(shelf_);
   set_notify_enter_exit_on_child(true);
   set_ink_drop_base_color(kShelfInkDropBaseColor);
   set_ink_drop_visible_opacity(kShelfInkDropVisibleOpacity);
 
   SetLayoutManager(new views::FillLayout);
 
   tray_container_->set_background(background_);
   AddChildView(tray_container_);
 
   tray_event_filter_.reset(new TrayEventFilter);
@@ skipping 142 matching lines @@
   // This is needed so that OnImplicitAnimationsCompleted() is called even upon
   // destruction of the animator. This can occure when parallel animations
   // caused by ScreenRotationAnimator end before the animations of
   // TrayBackgroundView. This allows for a proper update to the visual state of
   // the view. (crbug.com/476667)
   return true;
 }
 
 void TrayBackgroundView::HideTransformation() {
   gfx::Transform transform;
-  if (wm_shelf_->IsHorizontalAlignment())
+  if (shelf_->IsHorizontalAlignment())
     transform.Translate(width(), 0.0f);
   else
     transform.Translate(0.0f, height());
   layer()->SetTransform(transform);
 }
 
 TrayBubbleView::AnchorAlignment TrayBackgroundView::GetAnchorAlignment() const {
-  if (wm_shelf_->alignment() == SHELF_ALIGNMENT_LEFT)
+  if (shelf_->alignment() == SHELF_ALIGNMENT_LEFT)
     return TrayBubbleView::ANCHOR_ALIGNMENT_LEFT;
-  if (wm_shelf_->alignment() == SHELF_ALIGNMENT_RIGHT)
+  if (shelf_->alignment() == SHELF_ALIGNMENT_RIGHT)
     return TrayBubbleView::ANCHOR_ALIGNMENT_RIGHT;
   return TrayBubbleView::ANCHOR_ALIGNMENT_BOTTOM;
 }
 
 void TrayBackgroundView::SetIsActive(bool is_active) {
   if (is_active_ == is_active)
     return;
   is_active_ = is_active;
   AnimateInkDrop(is_active_ ? views::InkDropState::ACTIVATED
                             : views::InkDropState::DEACTIVATED,
@@ skipping 68 matching lines @@
       !separator_visible_) {
     return;
   }
   // In the given |canvas|, for a horizontal shelf draw a separator line to the
   // right or left of the TrayBackgroundView when the system is LTR or RTL
   // aligned, respectively. For a vertical shelf draw the separator line
   // underneath the items instead.
   const gfx::Rect local_bounds = GetLocalBounds();
   const SkColor color = SkColorSetA(SK_ColorWHITE, 0x4D);
 
-  if (wm_shelf_->IsHorizontalAlignment()) {
+  if (shelf_->IsHorizontalAlignment()) {
     const gfx::PointF point(
         base::i18n::IsRTL() ? 0 : (local_bounds.width() - kSeparatorWidth),
         (kShelfSize - kTrayItemSize) / 2);
     const gfx::Vector2dF vector(0, kTrayItemSize);
     canvas->Draw1pxLine(point, point + vector, color);
   } else {
     const gfx::PointF point((kShelfSize - kTrayItemSize) / 2,
                             local_bounds.height() - kSeparatorWidth);
     const gfx::Vector2dF vector(kTrayItemSize, 0);
     canvas->Draw1pxLine(point, point + vector, color);
   }
 }
 
 gfx::Insets TrayBackgroundView::GetBackgroundInsets() const {
   gfx::Insets insets =
-      GetMirroredBackgroundInsets(wm_shelf_->IsHorizontalAlignment());
+      GetMirroredBackgroundInsets(shelf_->IsHorizontalAlignment());
 
   // |insets| are relative to contents bounds. Change them to be relative to
   // local bounds.
   gfx::Insets local_contents_insets =
       GetLocalBounds().InsetsFrom(GetContentsBounds());
   MirrorInsetsIfNecessary(&local_contents_insets);
   insets += local_contents_insets;
 
   return insets;
 }
 
 gfx::Rect TrayBackgroundView::GetBackgroundBounds() const {
   gfx::Insets insets = GetBackgroundInsets();
   gfx::Rect bounds = GetLocalBounds();
   bounds.Inset(insets);
   return bounds;
 }
 
 }  // namespace ash