Adding new media controls to MediaNotification

content/browser/media/session/media_session.h

 // Copyright 2015 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 CONTENT_BROWSER_MEDIA_SESSION_MEDIA_SESSION_H_
 #define CONTENT_BROWSER_MEDIA_SESSION_MEDIA_SESSION_H_
 
 #include <stddef.h>
 
 #include "base/callback_list.h"
 #include "base/id_map.h"
 #include "base/macros.h"
 #include "base/optional.h"
 #include "content/browser/media/session/audio_focus_manager.h"
 #include "content/browser/media/session/media_session_uma_helper.h"
 #include "content/common/content_export.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/browser/web_contents_user_data.h"
 #include "content/public/common/media_metadata.h"
 
 class MediaSessionBrowserTest;
 
+namespace blink {
+namespace mojom {
+enum class MediaSessionAction;
+}  // namespace mojom
+}  // namespace blink
+
 namespace media {
 enum class MediaContentType;
 }  // namespace media
 
 namespace content {
 
 class AudioFocusDelegate;
 class AudioFocusManagerTest;
 class MediaSessionPlayerObserver;
+class MediaSessionServiceImpl;
 class MediaSessionStateObserver;
 class MediaSessionVisibilityBrowserTest;
 
 // MediaSession manages the media session and audio focus for a given
 // WebContents. It is requesting the audio focus, pausing when requested by the
 // system and dropping it on demand.
 // The audio focus can be of two types: Transient or Content. A Transient audio
 // focus will allow other players to duck instead of pausing and will be
 // declared as temporary to the system. A Content audio focus will not be
 // declared as temporary and will not allow other players to duck. If a given
 // WebContents can only have one audio focus at a time, it will be Content in
 // case of Transient and Content audio focus are both requested.
 // TODO(thakis,mlamouri): MediaSession isn't CONTENT_EXPORT'd because it creates
 // complicated build issues with WebContentsUserData being a non-exported
 // template, see htttps://crbug.com/589840. As a result, the class uses
 // CONTENT_EXPORT for methods that are being used from tests. CONTENT_EXPORT
 // should be moved back to the class when the Windows build will work with it.
 class MediaSession : public WebContentsObserver,

[whywhat, 2016/10/24 21:01:25]

hm, how does this relate to the MediaSession to MediaSessionImpl CL?

[Zhiqiang Zhang (Slow), 2016/10/25 10:46:55]

It's totally separate. Depending on which one is landed first, the other one
will need to rebase. The rebasing should be simple, just move the MediaSession
observer functions and MediaSession Resume/Suspend/Stop functions to proper
place.

                      protected WebContentsUserData<MediaSession> {
  public:
   enum class SuspendType {
     // Suspended by the system because a transient sound needs to be played.
     SYSTEM,
     // Suspended by the UI.
     UI,
     // Suspended by the page via script or user interaction.
     CONTENT,
   };
@@ skipping 44 matching lines @@
   CONTENT_EXPORT void Resume(SuspendType suspend_type);
 
   // Suspend the media session.
   // |type| represents the origin of the request.
   CONTENT_EXPORT void Suspend(SuspendType suspend_type);
 
   // Stop the media session.
   // |type| represents the origin of the request.
   CONTENT_EXPORT void Stop(SuspendType suspend_type);
 
+  // Called when an action is enabled in blink::MediaSession and notify

[whywhat, 2016/10/24 21:01:26]

nit: "Called ... and notify ..." is not a valid syntax structure I believe.
Maybe s/Called/call as a quick fix?

[Zhiqiang Zhang (Slow), 2016/10/25 10:46:55]

Done.

+  // observers.
+  void OnMediaSessionEnabledAction(blink::mojom::MediaSessionAction action);
+
+  // Called when an action is disabled in blink::MediaSession and notify

[whywhat, 2016/10/24 21:01:26]

ditto

[Zhiqiang Zhang (Slow), 2016/10/25 10:46:55]

Done.

+  // observers.
+  void OnMediaSessionDisabledAction(blink::mojom::MediaSessionAction action);
+
+  // Received a media session action and forward to blink::MediaSession.
+  void DidReceiveAction(blink::mojom::MediaSessionAction action);
+
   // Let the media session start ducking such that the volume multiplier is
   // reduced.
   CONTENT_EXPORT void StartDucking();
 
   // Let the media session stop ducking such that the volume multiplier is
   // recovered.
   CONTENT_EXPORT void StopDucking();
 
   // Returns if the session can be controlled by Resume() and Suspend calls
   // above.
@@ skipping 17 matching lines @@
   CONTENT_EXPORT AudioFocusManager::AudioFocusType audio_focus_type() const {
     return audio_focus_type_;
   }
 
   // Returns whether the session has Pepper instances.
   bool HasPepper() const;
 
   // WebContentsObserver implementation
   void WebContentsDestroyed() override;
 
+  void SetMediaSessionService(MediaSessionServiceImpl* service);
+
  private:
   friend class content::WebContentsUserData<MediaSession>;
   friend class ::MediaSessionBrowserTest;
   friend class content::MediaSessionVisibilityBrowserTest;
   friend class content::AudioFocusManagerTest;
   friend class content::MediaSessionStateObserver;
 
   CONTENT_EXPORT void SetDelegateForTests(
       std::unique_ptr<AudioFocusDelegate> delegate);
   CONTENT_EXPORT bool IsActiveForTest() const;
@@ skipping 69 matching lines @@
   MediaSessionUmaHelper uma_helper_;
 
   // The ducking state of this media session. The initial value is |false|, and
   // is set to |true| after StartDucking(), and will be set to |false| after
   // StopDucking().
   bool is_ducking_;
 
   base::Optional<MediaMetadata> metadata_;
   base::CallbackList<void(State)> media_session_state_listeners_;
 
+  // The MediaSessionService this session is associated with (the service of the
+  // top-level frame).
+  MediaSessionServiceImpl* service_;
+
   DISALLOW_COPY_AND_ASSIGN(MediaSession);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_MEDIA_SESSION_MEDIA_SESSION_H_