Use mojo Shelf interfaces for both mash and classic ash.

ash/common/wm_shell.h

Index: ash/common/wm_shell.h
diff --git a/ash/common/wm_shell.h b/ash/common/wm_shell.h
index b7c32e268f1afde738c3731acaf77f5de4bf7ec0..0c27864219023c2adae29509d4aadd195a91d779 100644
--- a/ash/common/wm_shell.h
+++ b/ash/common/wm_shell.h
@@ -14,6 +14,7 @@
 #include "ash/common/media_delegate.h"
 #include "ash/common/metrics/gesture_action_type.h"
 #include "ash/common/metrics/user_metrics_action.h"
+#include "ash/common/shelf/shelf_controller.h"
 #include "ash/common/wm/lock_state_observer.h"
 #include "base/observer_list.h"
 #include "ui/base/ui_base_types.h"
@@ -60,6 +61,7 @@ class NewWindowDelegate;
 class PaletteDelegate;
 class ScopedDisableInternalMouseAndKeyboard;
 class SessionStateDelegate;
+class ShelfController;
 class ShelfDelegate;
 class ShelfModel;
 class ShelfWindowWatcher;
@@ -146,9 +148,11 @@ class ASH_EXPORT WmShell {
 
   PaletteDelegate* palette_delegate() { return palette_delegate_.get(); }
 
+  ShelfController* shelf_controller() { return shelf_controller_.get(); }
+
   ShelfDelegate* shelf_delegate() { return shelf_delegate_.get(); }
 
-  ShelfModel* shelf_model() { return shelf_model_.get(); }
+  ShelfModel* shelf_model() { return shelf_controller_->model(); }

[James Cook, 2016/10/10 17:18:13]

drive by: I would implement this in the .cc file. The style guide does not
require hacker_style() functions to be inline, and shelf_controller.h includes
generated mojo headers that significantly slow down build time. Given that
shell.h is widely included I think it would be worth de-inlining this.

[msw, 2016/10/11 00:44:06]

Done.

 
   SystemTrayController* system_tray_controller() {
     return system_tray_controller_.get();
@@ -473,8 +477,8 @@ class ASH_EXPORT WmShell {
   std::unique_ptr<MruWindowTracker> mru_window_tracker_;
   std::unique_ptr<NewWindowDelegate> new_window_delegate_;
   std::unique_ptr<PaletteDelegate> palette_delegate_;
+  std::unique_ptr<ShelfController> shelf_controller_;
   std::unique_ptr<ShelfDelegate> shelf_delegate_;
-  std::unique_ptr<ShelfModel> shelf_model_;
   std::unique_ptr<ShelfWindowWatcher> shelf_window_watcher_;
   std::unique_ptr<SystemTrayController> system_tray_controller_;
   std::unique_ptr<SystemTrayNotifier> system_tray_notifier_;