ash: Convert ShelfDelegate to use WmShelf* instead of Shelf*

ash/common/shelf/wm_shelf.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/shelf/shelf.h"
 #include "ash/common/shelf/shelf_delegate.h"
 #include "ash/common/shelf/shelf_layout_manager.h"
 #include "ash/common/shelf/shelf_locking_manager.h"
 #include "ash/common/shelf/shelf_widget.h"
 #include "ash/common/shelf/wm_shelf.h"
@@ skipping 44 matching lines @@
 
   if (shelf_locking_manager_->is_locked() &&
       alignment != SHELF_ALIGNMENT_BOTTOM_LOCKED) {
     shelf_locking_manager_->set_stored_alignment(alignment);
     return;
   }
 
   alignment_ = alignment;
   // The ShelfWidget notifies the ShelfView of the alignment change.
   shelf_layout_manager_->shelf_widget()->OnShelfAlignmentChanged();
-  WmShell::Get()->shelf_delegate()->OnShelfAlignmentChanged(shelf_);
+  WmShell::Get()->shelf_delegate()->OnShelfAlignmentChanged(this);
   WmShell::Get()->NotifyShelfAlignmentChanged(GetWindow()->GetRootWindow());
   // ShelfLayoutManager will resize the shelf.
 }
 
 bool WmShelf::IsHorizontalAlignment() const {
   switch (alignment_) {
     case SHELF_ALIGNMENT_BOTTOM:
     case SHELF_ALIGNMENT_BOTTOM_LOCKED:
       return true;
     case SHELF_ALIGNMENT_LEFT:
@@ skipping 24 matching lines @@
   return IsHorizontalAlignment() ? horizontal : vertical;
 }
 
 void WmShelf::SetAutoHideBehavior(ShelfAutoHideBehavior auto_hide_behavior) {
   DCHECK(shelf_layout_manager_);
 
   if (auto_hide_behavior_ == auto_hide_behavior)
     return;
 
   auto_hide_behavior_ = auto_hide_behavior;
-  WmShell::Get()->shelf_delegate()->OnShelfAutoHideBehaviorChanged(shelf_);
+  WmShell::Get()->shelf_delegate()->OnShelfAutoHideBehaviorChanged(this);
   WmShell::Get()->NotifyShelfAutoHideBehaviorChanged(
       GetWindow()->GetRootWindow());
 }
 
 ShelfAutoHideState WmShelf::GetAutoHideState() const {
   return shelf_layout_manager_->auto_hide_state();
 }
 
 void WmShelf::UpdateAutoHideState() {
   shelf_layout_manager_->UpdateAutoHideState();
@@ skipping 103 matching lines @@
 
 void WmShelf::OnBackgroundUpdated(ShelfBackgroundType background_type,
                                   BackgroundAnimatorChangeType change_type) {
   if (background_type == GetBackgroundType())
     return;
   FOR_EACH_OBSERVER(WmShelfObserver, observers_,
                     OnBackgroundTypeChanged(background_type, change_type));
 }
 
 }  // namespace ash