webkit/media/android/webmediaplayer_android.cc - Issue 15063003: Cut content/browser dependency on webkit_media

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: webkit/media/android/webmediaplayer_android.cc

Issue 15063003: Cut content/browser dependency on webkit_media (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 years, 7 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: webkit/media/android/webmediaplayer_android.cc

diff --git a/webkit/media/android/webmediaplayer_android.cc b/webkit/media/android/webmediaplayer_android.cc

index da417184437aea4c37dca5202d1f635245c606ff..0b813bb78756304683ffb2ada10c128e21359034 100644

--- a/webkit/media/android/webmediaplayer_android.cc

+++ b/webkit/media/android/webmediaplayer_android.cc

@@ -11,6 +11,7 @@

#include "cc/layers/video_layer.h"

#include "gpu/GLES2/gl2extchromium.h"

#include "media/base/android/media_player_android.h"

+#include "media/base/media_switches.h"

#include "media/base/video_frame.h"

#include "net/base/mime_util.h"

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

@@ -22,7 +23,6 @@

#include "webkit/compositor_bindings/web_layer_impl.h"

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

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

-#include "webkit/media/media_switches.h"

#include "webkit/media/webmediaplayer_util.h"

#if defined(GOOGLE_TV)

« no previous file with comments | « media/base/media_switches.cc ('k') | webkit/media/media_switches.h » ('j') | no next file with comments »