media/base/android/java/src/org/chromium/media/MediaPlayerBridge.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: media/base/android/java/src/org/chromium/media/MediaPlayerBridge.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/public/android/java/src/org/chromium/content/browser/MediaResourceGetter.java ('k') | media/base/android/media_player_bridge.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/base/android/java/src/org/chromium/media/MediaPlayerBridge.java

diff --git a/media/base/android/java/src/org/chromium/media/MediaPlayerBridge.java b/media/base/android/java/src/org/chromium/media/MediaPlayerBridge.java

index ed9d5b62bde71a23d8faddba43c68b2642980e34..d38c1e50395b46baff72653d86228b913e0bf5e3 100644

--- a/media/base/android/java/src/org/chromium/media/MediaPlayerBridge.java

+++ b/media/base/android/java/src/org/chromium/media/MediaPlayerBridge.java

@@ -137,11 +137,12 @@ public class MediaPlayerBridge {

@CalledByNative

protected boolean setDataSource(

- Context context, String url, String cookies, boolean hideUrlLog) {

+ Context context, String url, String cookies, String userAgent, boolean hideUrlLog) {

Uri uri = Uri.parse(url);

HashMap<String, String> headersMap = new HashMap<String, String>();

if (hideUrlLog) headersMap.put("x-hide-urls-from-log", "true");

if (!TextUtils.isEmpty(cookies)) headersMap.put("Cookie", cookies);

+ if (!TextUtils.isEmpty(userAgent)) headersMap.put("User-Agent", userAgent);

try {

getLocalPlayer().setDataSource(context, uri, headersMap);

return true;