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

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

Issue 10834226: Android: don't construct PrerenderWebMediaPlayer. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 336 matching lines...) Expand 10 before | Expand all | Expand 10 after
347 content::RenderView* render_view, 347 content::RenderView* render_view,
348 WebKit::WebFrame* frame, 348 WebKit::WebFrame* frame,
349 WebKit::WebMediaPlayerClient* client, 349 WebKit::WebMediaPlayerClient* client,
350 base::WeakPtr<webkit_media::WebMediaPlayerDelegate> delegate, 350 base::WeakPtr<webkit_media::WebMediaPlayerDelegate> delegate,
351 media::FilterCollection* collection, 351 media::FilterCollection* collection,
352 WebKit::WebAudioSourceProvider* audio_source_provider, 352 WebKit::WebAudioSourceProvider* audio_source_provider,
353 media::AudioRendererSink* audio_renderer_sink, 353 media::AudioRendererSink* audio_renderer_sink,
354 media::MessageLoopFactory* message_loop_factory, 354 media::MessageLoopFactory* message_loop_factory,
355 webkit_media::MediaStreamClient* media_stream_client, 355 webkit_media::MediaStreamClient* media_stream_client,
356 media::MediaLog* media_log) { 356 media::MediaLog* media_log) {
357 #if defined(OS_ANDROID)
358 // Chromium for Android doesn't support prerender yet.
359 return NULL;
360 #else
357 if (!prerender::PrerenderHelper::IsPrerendering(render_view)) 361 if (!prerender::PrerenderHelper::IsPrerendering(render_view))
358 return NULL; 362 return NULL;
359 363
360 return new prerender::PrerenderWebMediaPlayer(render_view, frame, client, 364 return new prerender::PrerenderWebMediaPlayer(render_view, frame, client,
361 delegate, collection, audio_source_provider, audio_renderer_sink, 365 delegate, collection, audio_source_provider, audio_renderer_sink,
362 message_loop_factory, media_stream_client, media_log); 366 message_loop_factory, media_stream_client, media_log);
367 #endif
363 } 368 }
364 369
365 WebPlugin* ChromeContentRendererClient::CreatePlugin( 370 WebPlugin* ChromeContentRendererClient::CreatePlugin(
366 content::RenderView* render_view, 371 content::RenderView* render_view,
367 WebFrame* frame, 372 WebFrame* frame,
368 const WebPluginParams& original_params, 373 const WebPluginParams& original_params,
369 const ChromeViewHostMsg_GetPluginInfo_Status& status, 374 const ChromeViewHostMsg_GetPluginInfo_Status& status,
370 const webkit::WebPluginInfo& plugin, 375 const webkit::WebPluginInfo& plugin,
371 const std::string& actual_mime_type) { 376 const std::string& actual_mime_type) {
372 ChromeViewHostMsg_GetPluginInfo_Status::Value status_value = status.value; 377 ChromeViewHostMsg_GetPluginInfo_Status::Value status_value = status.value;
(...skipping 575 matching lines...) Expand 10 before | Expand all | Expand 10 after
948 bool ChromeContentRendererClient::IsOtherExtensionWithWebRequestInstalled() { 953 bool ChromeContentRendererClient::IsOtherExtensionWithWebRequestInstalled() {
949 return extension_dispatcher_->IsOtherExtensionWithWebRequestInstalled(); 954 return extension_dispatcher_->IsOtherExtensionWithWebRequestInstalled();
950 } 955 }
951 956
952 void ChromeContentRendererClient::RegisterPPAPIInterfaceFactories( 957 void ChromeContentRendererClient::RegisterPPAPIInterfaceFactories(
953 webkit::ppapi::PpapiInterfaceFactoryManager* factory_manager) { 958 webkit::ppapi::PpapiInterfaceFactoryManager* factory_manager) {
954 factory_manager->RegisterFactory(ChromePPAPIInterfaceFactory); 959 factory_manager->RegisterFactory(ChromePPAPIInterfaceFactory);
955 } 960 }
956 961
957 } // namespace chrome 962 } // namespace chrome
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698