chromeos: Rename ash::WmShelf to Shelf

ash/system/tray/tray_container.cc

 // Copyright 2017 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_container.h"
 
 #include <utility>
 
-#include "ash/shelf/wm_shelf.h"
+#include "ash/shelf/shelf.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ui/gfx/geometry/insets.h"
 #include "ui/views/border.h"
 #include "ui/views/layout/box_layout.h"
 
 namespace ash {
 
-TrayContainer::TrayContainer(WmShelf* wm_shelf) : wm_shelf_(wm_shelf) {
-  DCHECK(wm_shelf_);
+TrayContainer::TrayContainer(Shelf* shelf) : shelf_(shelf) {
+  DCHECK(shelf_);
 
   UpdateLayout();
 }
 
 TrayContainer::~TrayContainer() {}
 
 void TrayContainer::UpdateAfterShelfAlignmentChange() {
   UpdateLayout();
 }
 
@@ skipping 11 matching lines @@
   PreferredSizeChanged();
 }
 
 void TrayContainer::ViewHierarchyChanged(
     const ViewHierarchyChangedDetails& details) {
   if (details.parent == this)
     PreferredSizeChanged();
 }
 
 void TrayContainer::UpdateLayout() {
-  const bool is_horizontal = wm_shelf_->IsHorizontalAlignment();
+  const bool is_horizontal = shelf_->IsHorizontalAlignment();
 
   // Adjust the size of status tray dark background by adding additional
   // empty border.
   views::BoxLayout::Orientation orientation =
       is_horizontal ? views::BoxLayout::kHorizontal
                     : views::BoxLayout::kVertical;
 
   const int hit_region_with_separator = kHitRegionPadding + kSeparatorWidth;
   gfx::Insets insets(
       is_horizontal
@@ skipping 10 matching lines @@
   views::BoxLayout* layout =
       new views::BoxLayout(orientation, horizontal_margin, vertical_margin, 0);
 
   layout->set_minimum_cross_axis_size(kTrayItemSize);
   views::View::SetLayoutManager(layout);
 
   PreferredSizeChanged();
 }
 
 }  // namespace ash