content/browser/browser_main_loop.cc - Issue 2756333002: Rename MediaClientAndroid to MediaDrmBridgeClient

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/browser_main_loop.cc

Issue 2756333002: Rename MediaClientAndroid to MediaDrmBridgeClient (Closed)

Patch Set: Fix .h guards Created 3 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/browser_main_loop.cc

diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc

index 5a035af978b5428e5d09c223af05f0ce0b5a9975..d1d9f23bf2ab0d57f00ded5ea78f36b4946b4be6 100644

--- a/content/browser/browser_main_loop.cc

+++ b/content/browser/browser_main_loop.cc

@@ -128,7 +128,7 @@

#include "content/browser/android/tracing_controller_android.h"

#include "content/browser/media/android/browser_media_player_manager.h"

#include "content/browser/screen_orientation/screen_orientation_delegate_android.h"

-#include "media/base/android/media_client_android.h"

+#include "media/base/android/media_drm_bridge_client.h"

#include "ui/android/screen_android.h"

#include "ui/display/screen.h"

#include "ui/gl/gl_surface.h"

@@ -1592,7 +1592,7 @@ int BrowserMainLoop::BrowserThreadsStarted() {

#endif // defined(OS_MACOSX)

#if defined(OS_ANDROID)

- media::SetMediaClientAndroid(GetContentClient()->GetMediaClientAndroid());

+ media::SetMediaDrmBridgeClient(GetContentClient()->GetMediaDrmBridgeClient());

#endif

return result_code_;