| Index: content/renderer/media/android/webmediaplayer_manager_android.h
|
| diff --git a/webkit/renderer/media/android/webmediaplayer_manager_android.h b/content/renderer/media/android/webmediaplayer_manager_android.h
|
| similarity index 87%
|
| rename from webkit/renderer/media/android/webmediaplayer_manager_android.h
|
| rename to content/renderer/media/android/webmediaplayer_manager_android.h
|
| index 5a6cd40b24660a796818d8eb6d0c6396ec9a0550..d3992ea0b7f4be9ec142c0fc8e8dedf9ed3e12bb 100644
|
| --- a/webkit/renderer/media/android/webmediaplayer_manager_android.h
|
| +++ b/content/renderer/media/android/webmediaplayer_manager_android.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_WEBMEDIAPLAYER_MANAGER_ANDROID_H_
|
| -#define WEBKIT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_MANAGER_ANDROID_H_
|
| +#ifndef CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_MANAGER_ANDROID_H_
|
| +#define CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_MANAGER_ANDROID_H_
|
|
|
| #include <map>
|
|
|
| @@ -17,7 +17,7 @@ namespace gfx {
|
| class RectF;
|
| }
|
|
|
| -namespace webkit_media {
|
| +namespace content {
|
|
|
| class WebMediaPlayerAndroid;
|
|
|
| @@ -67,6 +67,6 @@ class WebMediaPlayerManagerAndroid {
|
| DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerManagerAndroid);
|
| };
|
|
|
| -} // namespace webkit_media
|
| +} // namespace content
|
|
|
| -#endif // WEBKIT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_MANAGER_ANDROID_H_
|
| +#endif // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_MANAGER_ANDROID_H_
|
|
|