content/browser/android/content_video_view.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/android/content_video_view.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/android/content_video_view.cc

diff --git a/content/browser/android/content_video_view.cc b/content/browser/android/content_video_view.cc

index 158749b75be6df302be718e410c34d0956351213..242134b6d5f5559be10a8e3989de71c5695a632c 100644

--- a/content/browser/android/content_video_view.cc

+++ b/content/browser/android/content_video_view.cc

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

#include "base/android/jni_android.h"

#include "base/command_line.h"

#include "base/logging.h"

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

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

#include "content/common/android/surface_texture_peer.h"

#include "content/public/common/content_switches.h"

#include "jni/ContentVideoView_jni.h"

@@ -22,7 +22,7 @@ bool ContentVideoView::RegisterContentVideoView(JNIEnv* env) {

return RegisterNativesImpl(env);

}

-ContentVideoView::ContentVideoView(MediaPlayerManagerAndroid* manager)

+ContentVideoView::ContentVideoView(MediaPlayerManagerImpl* manager)

: manager_(manager) {

}