Android MediaSession: do not resume a UI suspended session on a system resume.

content/browser/media/android/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_ANDROID_MEDIA_SESSION_H_
 #define CONTENT_BROWSER_MEDIA_ANDROID_MEDIA_SESSION_H_
 
 #include <jni.h>
 
 #include "base/android/scoped_java_ref.h"
@@ skipping 20 matching lines @@
 // Android system interaction occurs in the Java counterpart to this class.
 class CONTENT_EXPORT MediaSession
     : public WebContentsObserver,
       protected WebContentsUserData<MediaSession> {
  public:
   enum class Type {
     Content,
     Transient
   };
 
+  enum class SuspendType {
+    // Suspended by the system because a transient sound needs to be played.
+    System,

[qinmin, 2015/07/21 22:58:17]

s/System/SYSTEM/

+    // Suspended by the UI.
+    UI,
+  };
+
   static bool RegisterMediaSession(JNIEnv* env);
 
   // Returns the MediaSession associated to this WebContents. Creates one if
   // none is currently available.
   static MediaSession* Get(WebContents* web_contents);
 
   ~MediaSession() override;
 
   // Adds the given player to the current media session. Returns whether the
   // player was successfully added. If it returns false, AddPlayer() should be
@@ skipping 11 matching lines @@
   // Called when the Android system requests the MediaSession to be suspended.
   // Called by Java through JNI.
   void OnSuspend(JNIEnv* env, jobject obj, jboolean temporary);
 
   // Called when the Android system requests the MediaSession to be resumed.
   // Called by Java through JNI.
   void OnResume(JNIEnv* env, jobject obj);
 
   // Called when the user requests resuming the session. No-op if the session is
   // not controllable.
-  void Resume();
+  void Resume(SuspendType type);
 
   // Called when the user requests suspending the session. No-op if the session
   // is not controllable.
-  void Suspend();
+  void Suspend(SuspendType type);
 
   // Returns if the session can be controlled by Resume() and Suspend calls
   // above.
   bool IsControllable() const;
 
   // Returns if the session is currently suspended.
   bool IsSuspended() const;
 
  private:
   friend class content::WebContentsUserData<MediaSession>;
   friend class ::MediaSessionBrowserTest;
 
   // Resets the |j_media_session_| ref to prevent calling the Java backend
   // during content_browsertests.
   void ResetJavaRefForTest();
   bool IsActiveForTest() const;
   Type audio_focus_type_for_test() const;
   void RemoveAllPlayersForTest();
 
-  void OnSuspendInternal(bool temporary);
-  void OnResumeInternal();
+  void OnSuspendInternal(SuspendType type);
+  void OnResumeInternal(SuspendType type);
 
   enum class State {
     Active,

[qinmin, 2015/07/21 22:58:17]

change all the enum names here
ACTIVE, SUSPENDED, INACTIVE

-    TemporarilySuspended,
     Suspended,
+    Inactive
   };
 
   // Representation of a player for the MediaSession.
   struct PlayerIdentifier {
     PlayerIdentifier(MediaSessionObserver* observer, int player_id);
     PlayerIdentifier(const PlayerIdentifier&) = default;
 
     void operator=(const PlayerIdentifier&) = delete;
     bool operator==(const PlayerIdentifier& player_identifier) const;
 
@@ skipping 21 matching lines @@
   // MediaSession if the audio focus really need to be abandoned.
   void AbandonSystemAudioFocusIfNeeded();
 
   // Notifies WebContents about the state change of the media session.
   void UpdateWebContents();
 
   base::android::ScopedJavaGlobalRef<jobject> j_media_session_;
   PlayersMap players_;
 
   State audio_focus_state_;
+  SuspendType suspend_type_;
   Type audio_focus_type_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaSession);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_MEDIA_ANDROID_MEDIA_SESSION_H_