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

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

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_source_delegate.h
diff --git a/webkit/renderer/media/android/media_source_delegate.h b/content/renderer/media/android/media_source_delegate.h
similarity index 95%
rename from webkit/renderer/media/android/media_source_delegate.h
rename to content/renderer/media/android/media_source_delegate.h
index cc71521c6dac0a579815b8b1128ffa8e91749e9a..5fcdf78dba468fa3c2ab356f6379b9adc520f6f1 100644
--- a/webkit/renderer/media/android/media_source_delegate.h
+++ b/content/renderer/media/android/media_source_delegate.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef WEBKIT_RENDERER_MEDIA_ANDROID_MEDIA_SOURCE_DELEGATE_H_
-#define WEBKIT_RENDERER_MEDIA_ANDROID_MEDIA_SOURCE_DELEGATE_H_
+#ifndef CONTENT_RENDERER_MEDIA_ANDROID_MEDIA_SOURCE_DELEGATE_H_
+#define CONTENT_RENDERER_MEDIA_ANDROID_MEDIA_SOURCE_DELEGATE_H_
#include "base/callback.h"
#include "base/memory/ref_counted.h"
@@ -26,9 +26,8 @@ class MediaLog;
struct MediaPlayerHostMsg_ReadFromDemuxerAck_Params;
}
-namespace webkit_media {
+namespace content {
-class ProxyDecryptor;
class WebMediaPlayerProxyAndroid;
class MediaSourceDelegate : public media::DemuxerHost {
@@ -164,5 +163,6 @@ class MediaSourceDelegate : public media::DemuxerHost {
DISALLOW_COPY_AND_ASSIGN(MediaSourceDelegate);
};
-} // namespace webkit_media
-#endif // WEBKIT_RENDERER_MEDIA_ANDROID_MEDIA_SOURCE_DELEGATE_H_
+} // namespace content
+
+#endif // CONTENT_RENDERER_MEDIA_ANDROID_MEDIA_SOURCE_DELEGATE_H_
« no previous file with comments | « content/renderer/media/android/media_info_loader_unittest.cc ('k') | content/renderer/media/android/media_source_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698