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 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 363 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
374 PluginPlaceholder::CreateErrorPlugin(render_view, plugin_path); | 374 PluginPlaceholder::CreateErrorPlugin(render_view, plugin_path); |
375 return placeholder->plugin(); | 375 return placeholder->plugin(); |
376 } | 376 } |
377 | 377 |
378 webkit_media::WebMediaPlayerImpl* | 378 webkit_media::WebMediaPlayerImpl* |
379 ChromeContentRendererClient::OverrideCreateWebMediaPlayer( | 379 ChromeContentRendererClient::OverrideCreateWebMediaPlayer( |
380 content::RenderView* render_view, | 380 content::RenderView* render_view, |
381 WebKit::WebFrame* frame, | 381 WebKit::WebFrame* frame, |
382 WebKit::WebMediaPlayerClient* client, | 382 WebKit::WebMediaPlayerClient* client, |
383 base::WeakPtr<webkit_media::WebMediaPlayerDelegate> delegate, | 383 base::WeakPtr<webkit_media::WebMediaPlayerDelegate> delegate, |
384 media::FilterCollection* collection, | |
385 WebKit::WebAudioSourceProvider* audio_source_provider, | 384 WebKit::WebAudioSourceProvider* audio_source_provider, |
386 media::AudioRendererSink* audio_renderer_sink, | 385 media::AudioRendererSink* audio_renderer_sink, |
387 media::MessageLoopFactory* message_loop_factory, | 386 const scoped_refptr<media::GpuVideoDecoder::Factories>& gpu_factories, |
388 webkit_media::MediaStreamClient* media_stream_client, | 387 webkit_media::MediaStreamClient* media_stream_client, |
389 media::MediaLog* media_log) { | 388 media::MediaLog* media_log) { |
390 #if defined(OS_ANDROID) | 389 #if defined(OS_ANDROID) |
391 // Chromium for Android doesn't support prerender yet. | 390 // Chromium for Android doesn't support prerender yet. |
392 return NULL; | 391 return NULL; |
393 #else | 392 #else |
394 if (!prerender::PrerenderHelper::IsPrerendering(render_view)) | 393 if (!prerender::PrerenderHelper::IsPrerendering(render_view)) |
395 return NULL; | 394 return NULL; |
396 | 395 |
397 return new prerender::PrerenderWebMediaPlayer(render_view, frame, client, | 396 return new prerender::PrerenderWebMediaPlayer(render_view, frame, client, |
398 delegate, collection, audio_source_provider, audio_renderer_sink, | 397 delegate, audio_source_provider, audio_renderer_sink, |
399 message_loop_factory, media_stream_client, media_log); | 398 gpu_factories, media_stream_client, media_log); |
400 #endif | 399 #endif |
401 } | 400 } |
402 | 401 |
403 WebPlugin* ChromeContentRendererClient::CreatePlugin( | 402 WebPlugin* ChromeContentRendererClient::CreatePlugin( |
404 content::RenderView* render_view, | 403 content::RenderView* render_view, |
405 WebFrame* frame, | 404 WebFrame* frame, |
406 const WebPluginParams& original_params, | 405 const WebPluginParams& original_params, |
407 const ChromeViewHostMsg_GetPluginInfo_Output& output) { | 406 const ChromeViewHostMsg_GetPluginInfo_Output& output) { |
408 const ChromeViewHostMsg_GetPluginInfo_Status& status = output.status; | 407 const ChromeViewHostMsg_GetPluginInfo_Status& status = output.status; |
409 const webkit::WebPluginInfo& plugin = output.plugin; | 408 const webkit::WebPluginInfo& plugin = output.plugin; |
(...skipping 615 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1025 } | 1024 } |
1026 | 1025 |
1027 void ChromeContentRendererClient::RegisterPPAPIInterfaceFactories( | 1026 void ChromeContentRendererClient::RegisterPPAPIInterfaceFactories( |
1028 webkit::ppapi::PpapiInterfaceFactoryManager* factory_manager) { | 1027 webkit::ppapi::PpapiInterfaceFactoryManager* factory_manager) { |
1029 #if defined(ENABLE_PLUGINS) | 1028 #if defined(ENABLE_PLUGINS) |
1030 factory_manager->RegisterFactory(ChromePPAPIInterfaceFactory); | 1029 factory_manager->RegisterFactory(ChromePPAPIInterfaceFactory); |
1031 #endif | 1030 #endif |
1032 } | 1031 } |
1033 | 1032 |
1034 } // namespace chrome | 1033 } // namespace chrome |
OLD | NEW |