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

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

Issue 17502007: Move webkit/renderer/media/android/ to content/renderer/media/android/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix shared lib Created 7 years, 6 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.cc
diff --git a/webkit/renderer/media/media_info_loader.cc b/content/renderer/media/android/media_info_loader.cc
similarity index 97%
rename from webkit/renderer/media/media_info_loader.cc
rename to content/renderer/media/android/media_info_loader.cc
index 9aeba1f3f1c3b438b4ae2b08cda9cb88ecddd89c..61b794d48ef85bc91a3e499f39d6ae752063c987 100644
--- a/webkit/renderer/media/media_info_loader.cc
+++ b/content/renderer/media/android/media_info_loader.cc
@@ -2,15 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "webkit/renderer/media/media_info_loader.h"
+#include "content/renderer/media/android/media_info_loader.h"
#include "base/bits.h"
#include "base/callback_helpers.h"
#include "base/metrics/histogram.h"
-#include "third_party/WebKit/public/web/WebFrame.h"
#include "third_party/WebKit/public/platform/WebURLError.h"
#include "third_party/WebKit/public/platform/WebURLLoader.h"
#include "third_party/WebKit/public/platform/WebURLResponse.h"
+#include "third_party/WebKit/public/web/WebFrame.h"
using WebKit::WebFrame;
using WebKit::WebURLError;
@@ -18,8 +18,9 @@ using WebKit::WebURLLoader;
using WebKit::WebURLLoaderOptions;
using WebKit::WebURLRequest;
using WebKit::WebURLResponse;
+using webkit_media::ActiveLoader;
-namespace webkit_media {
+namespace content {
static const int kHttpOK = 200;
@@ -182,4 +183,4 @@ void MediaInfoLoader::DidBecomeReady(Status status) {
base::ResetAndReturn(&ready_cb_).Run(status);
}
-} // namespace webkit_media
+} // namespace content
« no previous file with comments | « content/renderer/media/android/media_info_loader.h ('k') | content/renderer/media/android/media_info_loader_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698