| Index: content/renderer/media/android/proxy_media_keys.h
|
| diff --git a/webkit/renderer/media/android/proxy_media_keys.h b/content/renderer/media/android/proxy_media_keys.h
|
| similarity index 84%
|
| rename from webkit/renderer/media/android/proxy_media_keys.h
|
| rename to content/renderer/media/android/proxy_media_keys.h
|
| index 9425dced08a58a884aa080304aa83be15f84b459..839fe5bd09c0e2f7ffdd0ecaa535f46a9468464b 100644
|
| --- a/webkit/renderer/media/android/proxy_media_keys.h
|
| +++ b/content/renderer/media/android/proxy_media_keys.h
|
| @@ -2,13 +2,13 @@
|
| // 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_PROXY_MEDIA_KEYS_H_
|
| -#define WEBKIT_RENDERER_MEDIA_ANDROID_PROXY_MEDIA_KEYS_H_
|
| +#ifndef CONTENT_RENDERER_MEDIA_ANDROID_PROXY_MEDIA_KEYS_H_
|
| +#define CONTENT_RENDERER_MEDIA_ANDROID_PROXY_MEDIA_KEYS_H_
|
|
|
| #include "base/basictypes.h"
|
| #include "media/base/media_keys.h"
|
|
|
| -namespace webkit_media {
|
| +namespace content {
|
|
|
| class WebMediaPlayerProxyAndroid;
|
|
|
| @@ -36,6 +36,6 @@ class ProxyMediaKeys : public media::MediaKeys {
|
| DISALLOW_COPY_AND_ASSIGN (ProxyMediaKeys);
|
| };
|
|
|
| -} // namespace webkit_media
|
| +} // namespace content
|
|
|
| -#endif // WEBKIT_RENDERER_MEDIA_ANDROID_PROXY_MEDIA_KEYS_H_
|
| +#endif // CONTENT_RENDERER_MEDIA_ANDROID_PROXY_MEDIA_KEYS_H_
|
|
|