Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(471)

Side by Side Diff: media/base/android/media_player_bridge.h

Issue 2338223003: Unassociating MediaSession from media players (in blink & content) (Closed)
Patch Set: fixed tests Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « media/base/android/media_player_android.cc ('k') | media/base/android/media_player_bridge.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef MEDIA_BASE_ANDROID_MEDIA_PLAYER_BRIDGE_H_ 5 #ifndef MEDIA_BASE_ANDROID_MEDIA_PLAYER_BRIDGE_H_
6 #define MEDIA_BASE_ANDROID_MEDIA_PLAYER_BRIDGE_H_ 6 #define MEDIA_BASE_ANDROID_MEDIA_PLAYER_BRIDGE_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 // the |manager| when needed. 45 // the |manager| when needed.
46 MediaPlayerBridge( 46 MediaPlayerBridge(
47 int player_id, 47 int player_id,
48 const GURL& url, 48 const GURL& url,
49 const GURL& first_party_for_cookies, 49 const GURL& first_party_for_cookies,
50 const std::string& user_agent, 50 const std::string& user_agent,
51 bool hide_url_log, 51 bool hide_url_log,
52 MediaPlayerManager* manager, 52 MediaPlayerManager* manager,
53 const OnDecoderResourcesReleasedCB& on_decoder_resources_released_cb, 53 const OnDecoderResourcesReleasedCB& on_decoder_resources_released_cb,
54 const GURL& frame_url, 54 const GURL& frame_url,
55 bool allow_credentials, 55 bool allow_credentials);
56 int media_session_id);
57 ~MediaPlayerBridge() override; 56 ~MediaPlayerBridge() override;
58 57
59 // Initialize this object and extract the metadata from the media. 58 // Initialize this object and extract the metadata from the media.
60 virtual void Initialize(); 59 virtual void Initialize();
61 60
62 // MediaPlayerAndroid implementation. 61 // MediaPlayerAndroid implementation.
63 void SetVideoSurface(gl::ScopedJavaSurface surface) override; 62 void SetVideoSurface(gl::ScopedJavaSurface surface) override;
64 void Start() override; 63 void Start() override;
65 void Pause(bool is_media_related_action) override; 64 void Pause(bool is_media_related_action) override;
66 void SeekTo(base::TimeDelta timestamp) override; 65 void SeekTo(base::TimeDelta timestamp) override;
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
216 215
217 // NOTE: Weak pointers must be invalidated before all other member variables. 216 // NOTE: Weak pointers must be invalidated before all other member variables.
218 base::WeakPtrFactory<MediaPlayerBridge> weak_factory_; 217 base::WeakPtrFactory<MediaPlayerBridge> weak_factory_;
219 218
220 DISALLOW_COPY_AND_ASSIGN(MediaPlayerBridge); 219 DISALLOW_COPY_AND_ASSIGN(MediaPlayerBridge);
221 }; 220 };
222 221
223 } // namespace media 222 } // namespace media
224 223
225 #endif // MEDIA_BASE_ANDROID_MEDIA_PLAYER_BRIDGE_H_ 224 #endif // MEDIA_BASE_ANDROID_MEDIA_PLAYER_BRIDGE_H_
OLDNEW
« no previous file with comments | « media/base/android/media_player_android.cc ('k') | media/base/android/media_player_bridge.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698