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

Side by Side Diff: chrome/renderer/chrome_content_renderer_client.cc

Issue 11468033: Vanquish the remnants of media::MessageLoopFactory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix comment Created 7 years, 11 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
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
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, 384 const webkit_media::WebMediaPlayerParams& params) {
385 WebKit::WebAudioSourceProvider* audio_source_provider,
386 media::AudioRendererSink* audio_renderer_sink,
387 media::MessageLoopFactory* message_loop_factory,
388 webkit_media::MediaStreamClient* media_stream_client,
389 media::MediaLog* media_log) {
390 #if defined(OS_ANDROID) 385 #if defined(OS_ANDROID)
391 // Chromium for Android doesn't support prerender yet. 386 // Chromium for Android doesn't support prerender yet.
392 return NULL; 387 return NULL;
393 #else 388 #else
394 if (!prerender::PrerenderHelper::IsPrerendering(render_view)) 389 if (!prerender::PrerenderHelper::IsPrerendering(render_view))
395 return NULL; 390 return NULL;
396 391
397 return new prerender::PrerenderWebMediaPlayer(render_view, frame, client, 392 return new prerender::PrerenderWebMediaPlayer(
398 delegate, collection, audio_source_provider, audio_renderer_sink, 393 render_view, frame, client, delegate, params);
399 message_loop_factory, media_stream_client, media_log);
400 #endif 394 #endif
401 } 395 }
402 396
403 WebPlugin* ChromeContentRendererClient::CreatePlugin( 397 WebPlugin* ChromeContentRendererClient::CreatePlugin(
404 content::RenderView* render_view, 398 content::RenderView* render_view,
405 WebFrame* frame, 399 WebFrame* frame,
406 const WebPluginParams& original_params, 400 const WebPluginParams& original_params,
407 const ChromeViewHostMsg_GetPluginInfo_Output& output) { 401 const ChromeViewHostMsg_GetPluginInfo_Output& output) {
408 const ChromeViewHostMsg_GetPluginInfo_Status& status = output.status; 402 const ChromeViewHostMsg_GetPluginInfo_Status& status = output.status;
409 const webkit::WebPluginInfo& plugin = output.plugin; 403 const webkit::WebPluginInfo& plugin = output.plugin;
(...skipping 615 matching lines...) Expand 10 before | Expand all | Expand 10 after
1025 } 1019 }
1026 1020
1027 void ChromeContentRendererClient::RegisterPPAPIInterfaceFactories( 1021 void ChromeContentRendererClient::RegisterPPAPIInterfaceFactories(
1028 webkit::ppapi::PpapiInterfaceFactoryManager* factory_manager) { 1022 webkit::ppapi::PpapiInterfaceFactoryManager* factory_manager) {
1029 #if defined(ENABLE_PLUGINS) 1023 #if defined(ENABLE_PLUGINS)
1030 factory_manager->RegisterFactory(ChromePPAPIInterfaceFactory); 1024 factory_manager->RegisterFactory(ChromePPAPIInterfaceFactory);
1031 #endif 1025 #endif
1032 } 1026 }
1033 1027
1034 } // namespace chrome 1028 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/renderer/chrome_content_renderer_client.h ('k') | chrome/renderer/prerender/prerender_webmediaplayer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698