mash: Disable ash_sysui; begin removal.

ash/sysui/shelf_delegate_mus.h

Index: ash/sysui/shelf_delegate_mus.h
diff --git a/ash/sysui/shelf_delegate_mus.h b/ash/sysui/shelf_delegate_mus.h
index c92575d7e329d499c674356b2908f9659e962da4..74b3948432b043422517394b3524f8c6a7733050 100644
--- a/ash/sysui/shelf_delegate_mus.h
+++ b/ash/sysui/shelf_delegate_mus.h
@@ -8,8 +8,6 @@
 #include <map>
 
 #include "ash/common/shelf/shelf_delegate.h"
-#include "ash/public/interfaces/shelf_layout.mojom.h"
-#include "ash/public/interfaces/user_window_controller.mojom.h"
 #include "mash/shelf/public/interfaces/shelf.mojom.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/public/cpp/bindings/interface_ptr_set.h"
@@ -20,11 +18,10 @@ class ShelfModel;
 
 namespace sysui {
 
-// Manages communication between the ash_sysui shelf, the window manager, and
-// the browser.
+// Manages communication between the mash shelf and the browser.
+// TODO(mash): Support ShelfController in mojo:ash and remove this sysui impl.
 class ShelfDelegateMus : public ShelfDelegate,
-                         public mash::shelf::mojom::ShelfController,
-                         public ash::mojom::UserWindowObserver {
+                         public mash::shelf::mojom::ShelfController {
  public:
   explicit ShelfDelegateMus(ShelfModel* model);
   ~ShelfDelegateMus() override;
@@ -56,27 +53,13 @@ class ShelfDelegateMus : public ShelfDelegate,
   void UnpinItem(const mojo::String& app_id) override;
   void SetItemImage(const mojo::String& app_id, const SkBitmap& image) override;
 
-  // ash::mojom::UserWindowObserver:
-  void OnUserWindowObserverAdded(
-      mojo::Array<ash::mojom::UserWindowPtr> user_windows) override;
-  void OnUserWindowAdded(ash::mojom::UserWindowPtr user_window) override;
-  void OnUserWindowRemoved(uint32_t window_id) override;
-  void OnUserWindowTitleChanged(uint32_t window_id,
-                                const mojo::String& window_title) override;
-  void OnUserWindowAppIconChanged(uint32_t window_id,
-                                  mojo::Array<uint8_t> app_icon) override;
-  void OnUserWindowFocusChanged(uint32_t window_id, bool has_focus) override;
-
-  // Set the Mus window preferred sizes, needed by mash::wm::ShelfLayout.
+  // Set the Mus window preferred sizes.
   void SetShelfPreferredSizes(Shelf* shelf);
 
   ShelfModel* model_;
 
   mojo::AssociatedInterfacePtrSet<mash::shelf::mojom::ShelfObserver> observers_;
 
-  ash::mojom::ShelfLayoutPtr shelf_layout_;
-  ash::mojom::UserWindowControllerPtr user_window_controller_;
-  mojo::Binding<ash::mojom::UserWindowObserver> binding_;
   std::map<uint32_t, ShelfID> window_id_to_shelf_id_;
 
   std::map<std::string, ShelfID> app_id_to_shelf_id_;