mash: Migrate MediaDelegate ownership and access to WmShell.

ash/common/wm_shell.h

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef ASH_COMMON_WM_SHELL_H_
 #define ASH_COMMON_WM_SHELL_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <vector>
 
 #include "ash/ash_export.h"
+#include "ash/common/media_delegate.h"
 #include "ash/common/metrics/user_metrics_action.h"
 
 namespace gfx {
 class Rect;
 }
 
 namespace views {
 class PointerWatcher;
 }
 
@@ skipping 30 matching lines @@
   // This is necessary for a handful of places that is difficult to plumb
   // through context.
   static void Set(WmShell* instance);
   static WmShell* Get();
   static bool HasInstance() { return instance_ != nullptr; }
 
   FocusCycler* focus_cycler() { return focus_cycler_.get(); }
 
   KeyboardUI* keyboard_ui() { return keyboard_ui_.get(); }
 
+  MediaDelegate* media_delegate() { return media_delegate_.get(); }
+
   SystemTrayNotifier* system_tray_notifier() {
     return system_tray_notifier_.get();
   }
 
   SystemTrayDelegate* system_tray_delegate() {
     return system_tray_delegate_.get();
   }
 
   WindowSelectorController* window_selector_controller() {
     return window_selector_controller_.get();
@@ skipping 102 matching lines @@
   // TODO(jamescook): Remove this when VirtualKeyboardController has been moved.
   virtual void ToggleIgnoreExternalKeyboard() = 0;
 #endif
 
  protected:
   WmShell();
   virtual ~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();
 
   void DeleteWindowSelectorController();
 
  private:
   friend class Shell;
 
   static WmShell* instance_;
 
   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_;
 
   bool simulate_modal_window_open_for_testing_ = false;
 
 #if defined(OS_CHROMEOS)
   std::unique_ptr<LogoutConfirmationController> logout_confirmation_controller_;
 #endif
 };
 
 }  // namespace ash
 
 #endif  // ASH_COMMON_WM_SHELL_H_