mash: Convert ShelfView to wm common types, clean up Shelf access

ash/aura/wm_shelf_aura.h

 // 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.
 
 #ifndef ASH_AURA_WM_SHELF_AURA_H_
 #define ASH_AURA_WM_SHELF_AURA_H_
 
 #include "ash/ash_export.h"
+#include "ash/common/shelf/shelf_icon_observer.h"
 #include "ash/common/shelf/wm_shelf.h"
-#include "ash/shelf/shelf_icon_observer.h"
 #include "ash/shelf/shelf_layout_manager_observer.h"
 #include "base/macros.h"
 #include "base/observer_list.h"
 
 namespace ash {
 
 class Shelf;
 class ShelfLayoutManager;
 
 // Aura implementation of WmShelf.
@@ skipping 61 matching lines @@
   ShelfLayoutManager* shelf_layout_manager_ = nullptr;
 
   base::ObserverList<WmShelfObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(WmShelfAura);
 };
 
 }  // namespace ash
 
 #endif  // ASH_AURA_WM_SHELF_AURA_H_