content/public/android/java/src/org/chromium/content/browser/MediaResourceGetter.java - Issue 130363002: Pass Chrome user agent string to Android media player

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/public/android/java/src/org/chromium/content/browser/MediaResourceGetter.java

Issue 130363002: Pass Chrome user agent string to Android media player (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: reverted the change in DEPS 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

« content/browser/media/android/media_resource_getter_impl.cc ('K') | « content/browser/media/android/media_resource_getter_impl.cc ('k') | media/base/android/java/src/org/chromium/media/MediaPlayerBridge.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/public/android/java/src/org/chromium/content/browser/MediaResourceGetter.java

diff --git a/content/public/android/java/src/org/chromium/content/browser/MediaResourceGetter.java b/content/public/android/java/src/org/chromium/content/browser/MediaResourceGetter.java

index cc41ceab1b059cdc807fff4a0e55a752d3da7248..685808aa22d9e290dd6b97183c1dbbd089adf6e3 100644

--- a/content/public/android/java/src/org/chromium/content/browser/MediaResourceGetter.java

+++ b/content/public/android/java/src/org/chromium/content/browser/MediaResourceGetter.java

@@ -55,7 +55,8 @@ class MediaResourceGetter {

}

@CalledByNative

- private static MediaMetadata extractMediaMetadata(Context context, String url, String cookies) {

+ private static MediaMetadata extractMediaMetadata(Context context, String url, String cookies,

+ String userAgent) {

int durationInMilliseconds = 0;

int width = 0;

int height = 0;

@@ -109,6 +110,9 @@ class MediaResourceGetter {

if (!TextUtils.isEmpty(cookies)) {

headersMap.put("Cookie", cookies);

}

+ if (!TextUtils.isEmpty(userAgent)) {

+ headersMap.put("User-Agent", userAgent);

+ }

retriever.setDataSource(url, headersMap);

}

String duration = retriever.extractMetadata(