Use mojo Shelf interfaces for both mash and classic ash.

ash/mus/shelf_delegate_mus.h

Index: ash/mus/shelf_delegate_mus.h
diff --git a/ash/mus/shelf_delegate_mus.h b/ash/mus/shelf_delegate_mus.h
index cd59b908eb42b5e6f0434e7b2b421030d37c076d..8f45b8daa79b08ba7274445f2dae169f7cd0224f 100644
--- a/ash/mus/shelf_delegate_mus.h
+++ b/ash/mus/shelf_delegate_mus.h
@@ -5,33 +5,21 @@
 #ifndef ASH_MUS_SHELF_DELEGATE_MUS_H_
 #define ASH_MUS_SHELF_DELEGATE_MUS_H_
 
-#include <map>
 #include <string>
 
 #include "ash/common/shelf/shelf_delegate.h"
 #include "ash/public/cpp/shelf_types.h"
-#include "ash/public/interfaces/shelf.mojom.h"
-#include "mojo/public/cpp/bindings/binding.h"
-#include "mojo/public/cpp/bindings/interface_ptr_set.h"
 
 namespace ash {
 
-class ShelfModel;
-
 // Manages communication between the mash shelf and the browser.
-class ShelfDelegateMus : public ShelfDelegate, public mojom::ShelfController {
+class ShelfDelegateMus : public ShelfDelegate {
  public:
-  explicit ShelfDelegateMus(ShelfModel* model);
+  ShelfDelegateMus();
   ~ShelfDelegateMus() override;
 
  private:
   // ShelfDelegate:
-  void OnShelfCreated(WmShelf* shelf) override;
-  void OnShelfDestroyed(WmShelf* shelf) override;
-  void OnShelfAlignmentChanged(WmShelf* shelf) override;
-  void OnShelfAutoHideBehaviorChanged(WmShelf* shelf) override;
-  void OnShelfAutoHideStateChanged(WmShelf* shelf) override;
-  void OnShelfVisibilityStateChanged(WmShelf* shelf) override;
   ShelfID GetShelfIDForAppID(const std::string& app_id) override;
   ShelfID GetShelfIDForAppIDAndLaunchID(const std::string& app_id,
                                         const std::string& launch_id) override;
@@ -41,25 +29,6 @@ class ShelfDelegateMus : public ShelfDelegate, public mojom::ShelfController {
   bool IsAppPinned(const std::string& app_id) override;
   void UnpinAppWithID(const std::string& app_id) override;
 
-  // mojom::ShelfController:
-  void AddObserver(mojom::ShelfObserverAssociatedPtrInfo observer) override;
-  void SetAlignment(ShelfAlignment alignment, int64_t display_id) override;
-  void SetAutoHideBehavior(ShelfAutoHideBehavior auto_hide,
-                           int64_t display_id) override;
-  void PinItem(mojom::ShelfItemPtr item,
-               mojom::ShelfItemDelegateAssociatedPtrInfo delegate) override;
-  void UnpinItem(const std::string& app_id) override;
-  void SetItemImage(const std::string& app_id, const SkBitmap& image) override;
-
-  ShelfModel* model_;
-
-  mojo::AssociatedInterfacePtrSet<mojom::ShelfObserver> observers_;
-
-  std::map<uint32_t, ShelfID> window_id_to_shelf_id_;
-
-  std::map<std::string, ShelfID> app_id_to_shelf_id_;
-  std::map<ShelfID, std::string> shelf_id_to_app_id_;
-
   DISALLOW_COPY_AND_ASSIGN(ShelfDelegateMus);
 };