Use mojo Shelf interfaces for both mash and classic ash.

ash/common/shelf/wm_shelf.h

Index: ash/common/shelf/wm_shelf.h
diff --git a/ash/common/shelf/wm_shelf.h b/ash/common/shelf/wm_shelf.h
index e273c033959dc3097f76e8d48dabf5c23cf42fa7..952dcfa03849e919cfc50386b3d84972fae48be4 100644
--- a/ash/common/shelf/wm_shelf.h
+++ b/ash/common/shelf/wm_shelf.h
@@ -39,6 +39,10 @@ class ASH_EXPORT WmShelf : public ShelfLayoutManagerObserver {
   // widget may not exist, or the shelf may not be visible.
   static WmShelf* ForWindow(WmWindow* window);
 
+  // Returns if shelf alignment options are enabled, and the user is able to
+  // adjust the alignment (eg. not allowed in guest and supervised user modes).
+  static bool ShelfAlignmentAllowed();
+
   virtual void CreateShelfWidget(WmWindow* root);
   void ShutdownShelfWidget();
   void DestroyShelfWidget();