OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/renderer/chrome_content_renderer_client.h" | 5 #include "chrome/renderer/chrome_content_renderer_client.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
(...skipping 335 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
346 content::RenderView* render_view, | 346 content::RenderView* render_view, |
347 WebKit::WebFrame* frame, | 347 WebKit::WebFrame* frame, |
348 WebKit::WebMediaPlayerClient* client, | 348 WebKit::WebMediaPlayerClient* client, |
349 base::WeakPtr<webkit_media::WebMediaPlayerDelegate> delegate, | 349 base::WeakPtr<webkit_media::WebMediaPlayerDelegate> delegate, |
350 media::FilterCollection* collection, | 350 media::FilterCollection* collection, |
351 WebKit::WebAudioSourceProvider* audio_source_provider, | 351 WebKit::WebAudioSourceProvider* audio_source_provider, |
352 media::AudioRendererSink* audio_renderer_sink, | 352 media::AudioRendererSink* audio_renderer_sink, |
353 media::MessageLoopFactory* message_loop_factory, | 353 media::MessageLoopFactory* message_loop_factory, |
354 webkit_media::MediaStreamClient* media_stream_client, | 354 webkit_media::MediaStreamClient* media_stream_client, |
355 media::MediaLog* media_log) { | 355 media::MediaLog* media_log) { |
356 #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
| |
357 // Chromium for Android doesn't support prerender yet. | |
358 return NULL; | |
359 #else | |
356 if (!prerender::PrerenderHelper::IsPrerendering(render_view)) | 360 if (!prerender::PrerenderHelper::IsPrerendering(render_view)) |
357 return NULL; | 361 return NULL; |
358 | 362 |
359 return new prerender::PrerenderWebMediaPlayer(render_view, frame, client, | 363 return new prerender::PrerenderWebMediaPlayer(render_view, frame, client, |
360 delegate, collection, audio_source_provider, audio_renderer_sink, | 364 delegate, collection, audio_source_provider, audio_renderer_sink, |
361 message_loop_factory, media_stream_client, media_log); | 365 message_loop_factory, media_stream_client, media_log); |
366 #endif | |
362 } | 367 } |
363 | 368 |
364 WebPlugin* ChromeContentRendererClient::CreatePlugin( | 369 WebPlugin* ChromeContentRendererClient::CreatePlugin( |
365 content::RenderView* render_view, | 370 content::RenderView* render_view, |
366 WebFrame* frame, | 371 WebFrame* frame, |
367 const WebPluginParams& original_params, | 372 const WebPluginParams& original_params, |
368 const ChromeViewHostMsg_GetPluginInfo_Status& status, | 373 const ChromeViewHostMsg_GetPluginInfo_Status& status, |
369 const webkit::WebPluginInfo& plugin, | 374 const webkit::WebPluginInfo& plugin, |
370 const std::string& actual_mime_type) { | 375 const std::string& actual_mime_type) { |
371 ChromeViewHostMsg_GetPluginInfo_Status::Value status_value = status.value; | 376 ChromeViewHostMsg_GetPluginInfo_Status::Value status_value = status.value; |
(...skipping 431 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
803 bool ChromeContentRendererClient::ShouldPumpEventsDuringCookieMessage() { | 808 bool ChromeContentRendererClient::ShouldPumpEventsDuringCookieMessage() { |
804 // We no longer pump messages, even under Chrome Frame. We rely on cookie | 809 // We no longer pump messages, even under Chrome Frame. We rely on cookie |
805 // read requests handled by CF not putting up UI or causing other actions | 810 // read requests handled by CF not putting up UI or causing other actions |
806 // that would require us to pump messages. This fixes http://crbug.com/110090. | 811 // that would require us to pump messages. This fixes http://crbug.com/110090. |
807 return false; | 812 return false; |
808 } | 813 } |
809 | 814 |
810 void ChromeContentRendererClient::DidCreateScriptContext( | 815 void ChromeContentRendererClient::DidCreateScriptContext( |
811 WebFrame* frame, v8::Handle<v8::Context> context, int extension_group, | 816 WebFrame* frame, v8::Handle<v8::Context> context, int extension_group, |
812 int world_id) { | 817 int world_id) { |
818 #if !defined(OS_ANDROID) | |
819 // Chromium for Android doesn't have extensions. | |
813 extension_dispatcher_->DidCreateScriptContext( | 820 extension_dispatcher_->DidCreateScriptContext( |
814 frame, context, extension_group, world_id); | 821 frame, context, extension_group, world_id); |
822 #endif | |
815 } | 823 } |
816 | 824 |
817 void ChromeContentRendererClient::WillReleaseScriptContext( | 825 void ChromeContentRendererClient::WillReleaseScriptContext( |
818 WebFrame* frame, v8::Handle<v8::Context> context, int world_id) { | 826 WebFrame* frame, v8::Handle<v8::Context> context, int world_id) { |
819 extension_dispatcher_->WillReleaseScriptContext(frame, context, world_id); | 827 extension_dispatcher_->WillReleaseScriptContext(frame, context, world_id); |
820 } | 828 } |
821 | 829 |
822 unsigned long long ChromeContentRendererClient::VisitedLinkHash( | 830 unsigned long long ChromeContentRendererClient::VisitedLinkHash( |
823 const char* canonical_url, size_t length) { | 831 const char* canonical_url, size_t length) { |
824 return visited_link_slave_->ComputeURLFingerprint(canonical_url, length); | 832 return visited_link_slave_->ComputeURLFingerprint(canonical_url, length); |
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
947 bool ChromeContentRendererClient::IsOtherExtensionWithWebRequestInstalled() { | 955 bool ChromeContentRendererClient::IsOtherExtensionWithWebRequestInstalled() { |
948 return extension_dispatcher_->IsOtherExtensionWithWebRequestInstalled(); | 956 return extension_dispatcher_->IsOtherExtensionWithWebRequestInstalled(); |
949 } | 957 } |
950 | 958 |
951 void ChromeContentRendererClient::RegisterPPAPIInterfaceFactories( | 959 void ChromeContentRendererClient::RegisterPPAPIInterfaceFactories( |
952 webkit::ppapi::PpapiInterfaceFactoryManager* factory_manager) { | 960 webkit::ppapi::PpapiInterfaceFactoryManager* factory_manager) { |
953 factory_manager->RegisterFactory(ChromePPAPIInterfaceFactory); | 961 factory_manager->RegisterFactory(ChromePPAPIInterfaceFactory); |
954 } | 962 } |
955 | 963 |
956 } // namespace chrome | 964 } // namespace chrome |
OLD | NEW |