Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5606)

Unified Diff: chrome/renderer/chrome_content_renderer_client.h

Issue 18123002: Migrate webkit/renderer/media/ to content/renderer/media/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/renderer/chrome_content_renderer_client.cc » ('j') | chrome/renderer/prerender/DEPS » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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,
« no previous file with comments | « no previous file | chrome/renderer/chrome_content_renderer_client.cc » ('j') | chrome/renderer/prerender/DEPS » ('J')

Powered by Google App Engine
This is Rietveld 408576698