content/renderer/render_view_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/renderer/render_view_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/renderer/render_view_impl.cc

diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc

index 6f0a2191439139b2f16d255eb0927b1d6fcbbe7d..49b374ff157cdd7eaf1c4025e8a842f381729164 100644

--- a/content/renderer/render_view_impl.cc

+++ b/content/renderer/render_view_impl.cc

@@ -224,7 +224,6 @@

#include "third_party/WebKit/Source/Platform/chromium/public/WebFloatRect.h"

#include "third_party/WebKit/Source/WebKit/chromium/public/WebHitTestResult.h"

#include "ui/gfx/rect_f.h"

-#include "webkit/media/android/media_player_bridge_manager_impl.h"

#include "webkit/media/android/webmediaplayer_android.h"

#include "webkit/media/android/webmediaplayer_manager_android.h"

#elif defined(OS_WIN)

« no previous file with comments | « content/renderer/render_view_impl.h ('k') | media/base/android/media_player_bridge.h » ('j') | no next file with comments »