ash: Remove ash::Shelf in favor of ash::WmShelf

ash/common/system/toast/toast_overlay.cc

 // Copyright 2016 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/common/system/toast/toast_overlay.h"
 
 #include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/wm_lookup.h"
 #include "ash/common/wm_root_window_controller.h"
@@ skipping 37 matching lines @@
 
 // These values are in DIP.
 const int kToastHorizontalSpacing = 16;
 const int kToastVerticalSpacing = 16;
 const int kToastMaximumWidth = 568;
 const int kToastMinimumWidth = 288;
 
 // Returns the work area bounds for the root window where new windows are added
 // (including new toasts).
 gfx::Rect GetUserWorkAreaBounds() {
-  return WmShell::Get()
-      ->GetRootWindowForNewWindows()
-      ->GetRootWindowController()
-      ->GetShelf()
+  return WmShelf::ForWindow(WmShell::Get()->GetRootWindowForNewWindows())
       ->GetUserWorkAreaBounds();
 }
 
 }  // anonymous namespace
 
 ///////////////////////////////////////////////////////////////////////////////
 //  ToastOverlayLabel
 class ToastOverlayLabel : public views::Label {
  public:
   explicit ToastOverlayLabel(const base::string16& label);
@@ skipping 224 matching lines @@
 
 views::Widget* ToastOverlay::widget_for_testing() {
   return overlay_widget_.get();
 }
 
 void ToastOverlay::ClickDismissButtonForTesting(const ui::Event& event) {
   overlay_view_->button()->NotifyClick(event);
 }
 
 }  // namespace ash