| Index: chrome/renderer/chrome_content_renderer_client.h
|
| diff --git a/chrome/renderer/chrome_content_renderer_client.h b/chrome/renderer/chrome_content_renderer_client.h
|
| index be628b218170d5ee85e335bd1d87568aa9fe01d8..e54233630a88822c372665935502dca3c0eae841 100644
|
| --- a/chrome/renderer/chrome_content_renderer_client.h
|
| +++ b/chrome/renderer/chrome_content_renderer_client.h
|
| @@ -85,12 +85,12 @@ class ChromeContentRendererClient : public content::ContentRendererClient {
|
| const WebKit::WebURLError& error,
|
| std::string* error_html,
|
| string16* error_description) OVERRIDE;
|
| - virtual webkit_media::WebMediaPlayerImpl* OverrideCreateWebMediaPlayer(
|
| + virtual content::WebMediaPlayerImpl* OverrideCreateWebMediaPlayer(
|
| content::RenderView* render_view,
|
| WebKit::WebFrame* frame,
|
| WebKit::WebMediaPlayerClient* client,
|
| - base::WeakPtr<webkit_media::WebMediaPlayerDelegate> delegate,
|
| - const webkit_media::WebMediaPlayerParams& params) OVERRIDE;
|
| + base::WeakPtr<content::WebMediaPlayerDelegate> delegate,
|
| + const content::WebMediaPlayerParams& params) OVERRIDE;
|
| virtual bool RunIdleHandlerWhenWidgetsHidden() OVERRIDE;
|
| virtual bool AllowPopup() OVERRIDE;
|
| virtual bool ShouldFork(WebKit::WebFrame* frame,
|
|
|