mash: Remove ShelfDelegate; move functions to ShelfModel.

ash/shell.h

Index: ash/shell.h
diff --git a/ash/shell.h b/ash/shell.h
index bfb22677289cca8444e926b76739002aa33863c0..ce6cbadc064e99565e4e43293cc809e6dc4b94b6 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -140,7 +140,6 @@ class ScreenPositionController;
 class SessionController;
 class SessionStateDelegate;
 class ShelfController;
-class ShelfDelegate;
 class ShelfModel;
 class ShelfWindowWatcher;
 class ShellDelegate;
@@ -331,7 +330,6 @@ class ASH_EXPORT Shell : public SessionStateObserver,
   }
   SessionController* session_controller() { return session_controller_.get(); }
   ShelfController* shelf_controller() { return shelf_controller_.get(); }
-  ShelfDelegate* shelf_delegate() { return shelf_delegate_.get(); }
   ShelfModel* shelf_model();
   ShutdownController* shutdown_controller() {
     return shutdown_controller_.get();
@@ -612,8 +610,6 @@ class ASH_EXPORT Shell : public SessionStateObserver,
   void SetSystemTrayDelegate(std::unique_ptr<SystemTrayDelegate> delegate);
   void DeleteSystemTrayDelegate();
 
-  void CreateShelfDelegate();
-
   // Destroys all child windows including widgets across all roots.
   void CloseAllRootWindowChildWindows();
 
@@ -680,7 +676,6 @@ class ASH_EXPORT Shell : public SessionStateObserver,
   std::unique_ptr<ResizeShadowController> resize_shadow_controller_;
   std::unique_ptr<SessionController> session_controller_;
   std::unique_ptr<ShelfController> shelf_controller_;
-  std::unique_ptr<ShelfDelegate> shelf_delegate_;
   std::unique_ptr<ShelfWindowWatcher> shelf_window_watcher_;
   std::unique_ptr<ShellDelegate> shell_delegate_;
   std::unique_ptr<ShutdownController> shutdown_controller_;