Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1494)

Unified Diff: content/renderer/media/android/media_info_loader.h

Issue 18261007: Migrate webkit/renderer/media/ to content/renderer/media/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 5 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 842ae83fe57866e16bdf9acd5f253bd5c99a9de0..9816febd34322326243114a3d1af0e8d0d9ae029 100644
--- a/content/renderer/media/android/media_info_loader.h
+++ b/content/renderer/media/android/media_info_loader.h
@@ -11,10 +11,10 @@
#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 "googleurl/src/gurl.h"
#include "third_party/WebKit/public/platform/WebURLLoaderClient.h"
#include "third_party/WebKit/public/web/WebMediaPlayer.h"
-#include "webkit/renderer/media/active_loader.h"
namespace WebKit {
class WebFrame;
@@ -105,7 +105,7 @@ class CONTENT_EXPORT MediaInfoLoader : private WebKit::WebURLLoaderClient {
scoped_ptr<WebKit::WebURLLoader> test_loader_;
// Keeps track of an active WebURLLoader and associated state.
- scoped_ptr<webkit_media::ActiveLoader> active_loader_;
+ scoped_ptr<ActiveLoader> active_loader_;
bool loader_failed_;
GURL url_;

Powered by Google App Engine
This is Rietveld 408576698