| Index: content/shell/renderer/shell_content_renderer_client.h
|
| diff --git a/content/shell/renderer/shell_content_renderer_client.h b/content/shell/renderer/shell_content_renderer_client.h
|
| index 998e83c93da77acdbc4cc4c8743973c49d8602da..f596240578f89682c53c4d7d95a97fbc196583b2 100644
|
| --- a/content/shell/renderer/shell_content_renderer_client.h
|
| +++ b/content/shell/renderer/shell_content_renderer_client.h
|
| @@ -10,7 +10,7 @@
|
| #include "base/platform_file.h"
|
| #include "content/public/renderer/content_renderer_client.h"
|
|
|
| -namespace WebKit {
|
| +namespace blink {
|
| class WebFrame;
|
| class WebPlugin;
|
| struct WebPluginParams;
|
| @@ -37,22 +37,22 @@ class ShellContentRendererClient : public ContentRendererClient {
|
| virtual void RenderViewCreated(RenderView* render_view) OVERRIDE;
|
| virtual bool OverrideCreatePlugin(
|
| RenderView* render_view,
|
| - WebKit::WebFrame* frame,
|
| - const WebKit::WebPluginParams& params,
|
| - WebKit::WebPlugin** plugin) OVERRIDE;
|
| - virtual WebKit::WebMediaStreamCenter* OverrideCreateWebMediaStreamCenter(
|
| - WebKit::WebMediaStreamCenterClient* client) OVERRIDE;
|
| - virtual WebKit::WebRTCPeerConnectionHandler*
|
| + blink::WebFrame* frame,
|
| + const blink::WebPluginParams& params,
|
| + blink::WebPlugin** plugin) OVERRIDE;
|
| + virtual blink::WebMediaStreamCenter* OverrideCreateWebMediaStreamCenter(
|
| + blink::WebMediaStreamCenterClient* client) OVERRIDE;
|
| + virtual blink::WebRTCPeerConnectionHandler*
|
| OverrideCreateWebRTCPeerConnectionHandler(
|
| - WebKit::WebRTCPeerConnectionHandlerClient* client) OVERRIDE;
|
| - virtual WebKit::WebMIDIAccessor* OverrideCreateMIDIAccessor(
|
| - WebKit::WebMIDIAccessorClient* client) OVERRIDE;
|
| - virtual WebKit::WebAudioDevice* OverrideCreateAudioDevice(
|
| + blink::WebRTCPeerConnectionHandlerClient* client) OVERRIDE;
|
| + virtual blink::WebMIDIAccessor* OverrideCreateMIDIAccessor(
|
| + blink::WebMIDIAccessorClient* client) OVERRIDE;
|
| + virtual blink::WebAudioDevice* OverrideCreateAudioDevice(
|
| double sample_rate) OVERRIDE;
|
| - virtual WebKit::WebClipboard* OverrideWebClipboard() OVERRIDE;
|
| - virtual WebKit::WebThemeEngine* OverrideThemeEngine() OVERRIDE;
|
| + virtual blink::WebClipboard* OverrideWebClipboard() OVERRIDE;
|
| + virtual blink::WebThemeEngine* OverrideThemeEngine() OVERRIDE;
|
| virtual bool AllowBrowserPlugin(
|
| - WebKit::WebPluginContainer* container) OVERRIDE;
|
| + blink::WebPluginContainer* container) OVERRIDE;
|
|
|
| private:
|
| void WebTestProxyCreated(RenderView* render_view,
|
|
|