mash: Migrate MediaDelegate ownership and access to WmShell.

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 6a9632e2882ef997ea939453087b9a3c351ba0ec..01b3216a37b4fc5cef5f77d83d92497bca6daa31 100644
--- a/ash/common/wm_shell.h
+++ b/ash/common/wm_shell.h
@@ -11,6 +11,7 @@
 #include <vector>
 
 #include "ash/ash_export.h"
+#include "ash/common/media_delegate.h"
 #include "ash/common/metrics/user_metrics_action.h"
 
 namespace gfx {
@@ -61,6 +62,8 @@ class ASH_EXPORT WmShell {
 
   KeyboardUI* keyboard_ui() { return keyboard_ui_.get(); }
 
+  MediaDelegate* media_delegate() { return media_delegate_.get(); }
+
   SystemTrayNotifier* system_tray_notifier() {
     return system_tray_notifier_.get();
   }
@@ -183,7 +186,11 @@ class ASH_EXPORT WmShell {
 
   void SetKeyboardUI(std::unique_ptr<KeyboardUI> keyboard_ui);
 
-  // Sets and initializes the |delegate|.
+  // Helpers to set (and initialize) or destroy various delegates.
+  // TODO(msw|jamescook): Remove these once ShellDelegate, etc. are ported.
+  void set_media_delegate(std::unique_ptr<MediaDelegate> delegate) {

[James Cook, 2016/06/30 21:19:54]

nit: I would do SetMediaDelegate() and put this in the cc file.

[msw, 2016/06/30 21:28:18]

Done.

+    media_delegate_ = std::move(delegate);
+  }
   void SetSystemTrayDelegate(std::unique_ptr<SystemTrayDelegate> delegate);
   void DeleteSystemTrayDelegate();
 
@@ -196,6 +203,7 @@ class ASH_EXPORT WmShell {
 
   std::unique_ptr<FocusCycler> focus_cycler_;
   std::unique_ptr<KeyboardUI> keyboard_ui_;
+  std::unique_ptr<MediaDelegate> media_delegate_;

[James Cook, 2016/06/30 21:19:54]

hooray for keeping them alphabetized!

[msw, 2016/06/30 21:28:18]

Acknowledged.

   std::unique_ptr<SystemTrayNotifier> system_tray_notifier_;
   std::unique_ptr<SystemTrayDelegate> system_tray_delegate_;
   std::unique_ptr<WindowSelectorController> window_selector_controller_;