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

Unified Diff: media/base/android/media_player_bridge.cc

Issue 130363002: Pass Chrome user agent string to Android media player (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: addressed comments Created 6 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/base/android/media_player_bridge.h ('k') | media/base/android/media_resource_getter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/android/media_player_bridge.cc
diff --git a/media/base/android/media_player_bridge.cc b/media/base/android/media_player_bridge.cc
index 0f79c13ad93f7283c014e2ed8e1d8a8cbb69a691..31be6c019135b8fe1e6b704d5384e25ccf2f4681 100644
--- a/media/base/android/media_player_bridge.cc
+++ b/media/base/android/media_player_bridge.cc
@@ -26,14 +26,15 @@ MediaPlayerBridge::MediaPlayerBridge(
int player_id,
const GURL& url,
const GURL& first_party_for_cookies,
+ const std::string& user_agent,
bool hide_url_log,
MediaPlayerManager* manager)
- : MediaPlayerAndroid(player_id,
- manager),
+ : MediaPlayerAndroid(player_id, manager),
prepared_(false),
pending_play_(false),
url_(url),
first_party_for_cookies_(first_party_for_cookies),
+ user_agent_(user_agent),
hide_url_log_(hide_url_log),
width_(0),
height_(0),
@@ -147,6 +148,8 @@ void MediaPlayerBridge::SetDataSource(const std::string& url) {
ScopedJavaLocalRef<jstring> j_url_string = ConvertUTF8ToJavaString(env, url);
ScopedJavaLocalRef<jstring> j_cookies = ConvertUTF8ToJavaString(
env, cookies_);
+ ScopedJavaLocalRef<jstring> j_user_agent = ConvertUTF8ToJavaString(
+ env, user_agent_);
jobject j_context = base::android::GetApplicationContext();
DCHECK(j_context);
@@ -162,7 +165,7 @@ void MediaPlayerBridge::SetDataSource(const std::string& url) {
if (!Java_MediaPlayerBridge_setDataSource(
env, j_media_player_bridge_.obj(), j_context, j_url_string.obj(),
- j_cookies.obj(), hide_url_log_)) {
+ j_cookies.obj(), j_user_agent.obj(), hide_url_log_)) {
OnMediaError(MEDIA_ERROR_FORMAT);
return;
}
@@ -191,8 +194,9 @@ void MediaPlayerBridge::OnCookiesRetrieved(const std::string& cookies) {
void MediaPlayerBridge::ExtractMediaMetadata(const std::string& url) {
manager()->GetMediaResourceGetter()->ExtractMediaMetadata(
- url, cookies_, base::Bind(&MediaPlayerBridge::OnMediaMetadataExtracted,
- weak_this_.GetWeakPtr()));
+ url, cookies_, user_agent_,
+ base::Bind(&MediaPlayerBridge::OnMediaMetadataExtracted,
+ weak_this_.GetWeakPtr()));
}
void MediaPlayerBridge::OnMediaMetadataExtracted(
« no previous file with comments | « media/base/android/media_player_bridge.h ('k') | media/base/android/media_resource_getter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698