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

Unified Diff: chrome/renderer/chrome_content_renderer_client.cc

Issue 10825155: Build target for Android WebView. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Implement a ContentMainDelegate Created 8 years, 4 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
« android_webview/lib/main/webview_stubs.cc ('K') | « build/all_android.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/chrome_content_renderer_client.cc
diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc
index a386ac0dcf94dfbad4c50a2e3da67bc21e5e79b9..7bfa6f5943491f1d0a3070d2e5a5dbbd3114f42b 100644
--- a/chrome/renderer/chrome_content_renderer_client.cc
+++ b/chrome/renderer/chrome_content_renderer_client.cc
@@ -353,12 +353,17 @@ ChromeContentRendererClient::OverrideCreateWebMediaPlayer(
media::MessageLoopFactory* message_loop_factory,
webkit_media::MediaStreamClient* media_stream_client,
media::MediaLog* media_log) {
+#if defined(OS_ANDROID)
Jói 2012/08/07 13:49:47 It seems like you can avoid this #if and the one b
Torne 2012/08/07 13:58:09 These things need to be disabled for the regular C
Jói 2012/08/07 14:17:31 Thanks for the explanation Torne, that makes sense
+ // Chromium for Android doesn't support prerender yet.
+ return NULL;
+#else
if (!prerender::PrerenderHelper::IsPrerendering(render_view))
return NULL;
return new prerender::PrerenderWebMediaPlayer(render_view, frame, client,
delegate, collection, audio_source_provider, audio_renderer_sink,
message_loop_factory, media_stream_client, media_log);
+#endif
}
WebPlugin* ChromeContentRendererClient::CreatePlugin(
@@ -810,8 +815,11 @@ bool ChromeContentRendererClient::ShouldPumpEventsDuringCookieMessage() {
void ChromeContentRendererClient::DidCreateScriptContext(
WebFrame* frame, v8::Handle<v8::Context> context, int extension_group,
int world_id) {
+#if !defined(OS_ANDROID)
+ // Chromium for Android doesn't have extensions.
extension_dispatcher_->DidCreateScriptContext(
frame, context, extension_group, world_id);
+#endif
}
void ChromeContentRendererClient::WillReleaseScriptContext(
« android_webview/lib/main/webview_stubs.cc ('K') | « build/all_android.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698