content/browser/media/android/browser_media_player_manager.cc - Issue 928643003: Upstream Chrome for Android Cast.

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/browser/media/android/browser_media_player_manager.cc

Issue 928643003: Upstream Chrome for Android Cast. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix chrome.gyp dependencies Created 5 years, 9 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:

Index: content/browser/media/android/browser_media_player_manager.cc

diff --git a/content/browser/media/android/browser_media_player_manager.cc b/content/browser/media/android/browser_media_player_manager.cc

index 665e4397f948f8dc0066ed3d953491b7acd4727a..e06fb2c16db870a260ad846e83165e8269b20c65 100644

--- a/content/browser/media/android/browser_media_player_manager.cc

+++ b/content/browser/media/android/browser_media_player_manager.cc

@@ -47,7 +47,12 @@ static media::MediaUrlInterceptor* media_url_interceptor_ = NULL;

// static

void BrowserMediaPlayerManager::RegisterFactory(Factory factory) {

- g_factory = factory;

+ // TODO(aberent) nullptr test is a temporary fix to simplify upstreaming Cast.

+ // Until Cast is fully upstreamed we want the downstream factory to take

+ // priority over the upstream factory. The downstream call happens first,

+ // so this will ensure that it does.

+ if (g_factory == nullptr)

+ g_factory = factory;

}

// static

« chrome/chrome.gyp ('K') | « chrome/chrome_browser.gypi ('k') | no next file » | no next file with comments »