| Index: content/public/renderer/content_renderer_client.h
|
| diff --git a/content/public/renderer/content_renderer_client.h b/content/public/renderer/content_renderer_client.h
|
| index 9ed12ad42e98019e8df11c68c76811f4d664edd0..1378c57088269100702b823d15cca330943ca439 100644
|
| --- a/content/public/renderer/content_renderer_client.h
|
| +++ b/content/public/renderer/content_renderer_client.h
|
| @@ -53,14 +53,10 @@ class PpapiInterfaceFactoryManager;
|
| struct WebPluginInfo;
|
| }
|
|
|
| -namespace webkit_media {
|
| -class MediaLoadDelegate;
|
| -class MediaStreamClient;
|
| -}
|
| -
|
| namespace content {
|
|
|
| class RenderView;
|
| +class MediaStreamClient;
|
| class SynchronousCompositor;
|
|
|
| // Embedder API for participating in renderer logic.
|
| @@ -143,7 +139,7 @@ class CONTENT_EXPORT ContentRendererClient {
|
|
|
| // Allows the embedder to override creating a MediaStreamClient. If it returns
|
| // NULL the content layer will create the media stream client.
|
| - virtual webkit_media::MediaStreamClient* OverrideCreateMediaStreamClient();
|
| + virtual MediaStreamClient* OverrideCreateMediaStreamClient();
|
|
|
| // Allows the embedder to override creating a WebMIDIAccessor. If it
|
| // returns NULL the content layer will create the MIDI accessor.
|
|
|