Index: media/base/android/media_player_bridge.h |
diff --git a/media/base/android/media_player_bridge.h b/media/base/android/media_player_bridge.h |
index bb3a655897eb1b0fb140081e84608b594c3a816c..68826a6a2a81a94c3130045ed60c2fe8719f6710 100644 |
--- a/media/base/android/media_player_bridge.h |
+++ b/media/base/android/media_player_bridge.h |
@@ -13,6 +13,7 @@ |
#include "base/callback.h" |
#include "base/memory/scoped_ptr.h" |
#include "base/memory/weak_ptr.h" |
+#include "base/string_util.h" |
#include "base/time.h" |
#include "base/timer.h" |
#include "media/base/media_export.h" |
@@ -20,7 +21,7 @@ |
namespace media { |
-class CookieGetter; |
+class MediaResourceGetter; |
class MediaPlayerBridgeManager; |
// This class serves as a bridge for native code to call java functions inside |
@@ -76,7 +77,7 @@ class MEDIA_EXPORT MediaPlayerBridge { |
MediaPlayerBridge(int player_id, |
const std::string& url, |
scherkus (not reviewing)
2013/03/08 21:26:27
hmm... it'd be nice to use a GURL instead of a str
qinmin
2013/03/08 22:36:12
Fixed.
I remember I tried to use GURL in the past
|
const std::string& first_party_for_cookies, |
- CookieGetter* cookie_getter, |
+ MediaResourceGetter* resource_getter, |
bool hide_url_log, |
MediaPlayerBridgeManager* manager, |
const MediaErrorCB& media_error_cb, |
@@ -141,6 +142,9 @@ class MEDIA_EXPORT MediaPlayerBridge { |
// Callback function passed to |cookies_retriever_|. |
void GetCookiesCallback(const std::string& cookies); |
+ // Set the data source for the media player. |
+ void SetDataSource(const std::string& url); |
+ |
int player_id() { return player_id_; } |
bool can_pause() { return can_pause_; } |
bool can_seek_forward() { return can_seek_forward_; } |
@@ -208,8 +212,8 @@ class MEDIA_EXPORT MediaPlayerBridge { |
// Resource manager for all the media players. |
MediaPlayerBridgeManager* manager_; |
- // Object for retrieving cookies for this media player. |
- scoped_ptr<CookieGetter> cookie_getter_; |
+ // Object for retrieving resources for this media player. |
+ scoped_ptr<MediaResourceGetter> resource_getter_; |
// Java MediaPlayer instance. |
base::android::ScopedJavaGlobalRef<jobject> j_media_player_; |