content/renderer/media/android/media_info_loader.h - Issue 495353003: Move WebMediaPlayerImpl and its dependencies to media/blink.

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/media/android/media_info_loader.h

Issue 495353003: Move WebMediaPlayerImpl and its dependencies to media/blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: . Created 6 years, 3 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:

View side-by-side diff with in-line comments

Download patch

Index: content/renderer/media/android/media_info_loader.h

diff --git a/content/renderer/media/android/media_info_loader.h b/content/renderer/media/android/media_info_loader.h

index caefc9d16729ce220e5f866407e8451b7655042c..b421fb3796b58bf36bc58ef279d3a0cf791d1c7f 100644

--- a/content/renderer/media/android/media_info_loader.h

+++ b/content/renderer/media/android/media_info_loader.h

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

#include "base/memory/scoped_ptr.h"

#include "base/time/time.h"

#include "content/common/content_export.h"

-#include "content/renderer/media/active_loader.h"

+#include "media/blink/active_loader.h"

#include "third_party/WebKit/public/platform/WebMediaPlayer.h"

#include "third_party/WebKit/public/platform/WebURLLoaderClient.h"

#include "third_party/WebKit/public/web/WebDocument.h"

@@ -113,7 +113,7 @@ class CONTENT_EXPORT MediaInfoLoader : private blink::WebURLLoaderClient {

scoped_ptr<blink::WebURLLoader> test_loader_;

// Keeps track of an active WebURLLoader and associated state.

- scoped_ptr<ActiveLoader> active_loader_;

+ scoped_ptr<media::ActiveLoader> active_loader_;

bool loader_failed_;

GURL url_;

« no previous file with comments | « content/renderer/media/active_loader.cc ('k') | content/renderer/media/android/media_info_loader.cc » ('j') | no next file with comments »