content/browser/renderer_host/render_view_host_impl.cc - Issue 14314020: Rename MediaPlayerBridgeManager to MediaPlayerManager

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/renderer_host/render_view_host_impl.cc

Issue 14314020: Rename MediaPlayerBridgeManager to MediaPlayerManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: additional rebase conflict Created 7 years, 8 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/renderer_host/render_view_host_impl.cc

diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc

index cea45b77aa75e92f802e17db38bbc79ef8b7a836..3190b7dd01a11c5192397490536e0dd3f3066287 100644

--- a/content/browser/renderer_host/render_view_host_impl.cc

+++ b/content/browser/renderer_host/render_view_host_impl.cc

@@ -76,7 +76,7 @@

#elif defined(OS_MACOSX)

#include "content/browser/renderer_host/popup_menu_helper_mac.h"

#elif defined(OS_ANDROID)

-#include "content/browser/android/media_player_manager_android.h"

+#include "content/browser/android/media_player_manager_impl.h"

#endif

using base::TimeDelta;

@@ -195,7 +195,7 @@ RenderViewHostImpl::RenderViewHostImpl(

g_created_callbacks.Get().at(i).Run(this);

#if defined(OS_ANDROID)

- media_player_manager_ = new MediaPlayerManagerAndroid(this);

+ media_player_manager_ = new MediaPlayerManagerImpl(this);

#endif

}