| Index: webkit/renderer/media/android/webmediaplayer_android.h
|
| diff --git a/webkit/renderer/media/android/webmediaplayer_android.h b/webkit/renderer/media/android/webmediaplayer_android.h
|
| index 39222b7a0ea2cf888c7d48ae388e7465d4e2bf8d..b0e38405c6249d7776999f27e7e2b5c91c4811f0 100644
|
| --- a/webkit/renderer/media/android/webmediaplayer_android.h
|
| +++ b/webkit/renderer/media/android/webmediaplayer_android.h
|
| @@ -21,6 +21,7 @@
|
| #include "third_party/WebKit/public/platform/WebURL.h"
|
| #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayer.h"
|
| #include "ui/gfx/rect_f.h"
|
| +#include "webkit/renderer/media/android/media_info_loader_android.h"
|
| #include "webkit/renderer/media/android/media_source_delegate.h"
|
| #include "webkit/renderer/media/android/stream_texture_factory_android.h"
|
| #include "webkit/renderer/media/crypto/proxy_decryptor.h"
|
| @@ -252,7 +253,6 @@ class WebMediaPlayerAndroid
|
| void SetNeedsEstablishPeer(bool needs_establish_peer);
|
|
|
| void InitializeMediaPlayer(
|
| - const WebKit::WebURL& url,
|
| media::MediaPlayerAndroid::SourceType source_type);
|
|
|
| #if defined(GOOGLE_TV)
|
| @@ -262,6 +262,7 @@ class WebMediaPlayerAndroid
|
|
|
| private:
|
| void ReallocateVideoFrame();
|
| + void DidLoadMediaInfo(MediaInfoLoaderAndroid::Status status);
|
|
|
| // Actually do the work for generateKeyRequest/addKey so they can easily
|
| // report results to UMA.
|
| @@ -381,6 +382,8 @@ class WebMediaPlayerAndroid
|
| media::MediaLog* media_log_;
|
| MediaStreamClient* media_stream_client_;
|
|
|
| + scoped_ptr<MediaInfoLoaderAndroid> info_loader_;
|
| +
|
| // The currently selected key system. Empty string means that no key system
|
| // has been selected.
|
| WebKit::WebString current_key_system_;
|
|
|