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

Side by Side 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: Shuffle files about a bit and address comments 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
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 335 matching lines...) Expand 10 before | Expand all | Expand 10 after
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)
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 575 matching lines...) Expand 10 before | Expand all | Expand 10 after
947 bool ChromeContentRendererClient::IsOtherExtensionWithWebRequestInstalled() { 952 bool ChromeContentRendererClient::IsOtherExtensionWithWebRequestInstalled() {
948 return extension_dispatcher_->IsOtherExtensionWithWebRequestInstalled(); 953 return extension_dispatcher_->IsOtherExtensionWithWebRequestInstalled();
949 } 954 }
950 955
951 void ChromeContentRendererClient::RegisterPPAPIInterfaceFactories( 956 void ChromeContentRendererClient::RegisterPPAPIInterfaceFactories(
952 webkit::ppapi::PpapiInterfaceFactoryManager* factory_manager) { 957 webkit::ppapi::PpapiInterfaceFactoryManager* factory_manager) {
953 factory_manager->RegisterFactory(ChromePPAPIInterfaceFactory); 958 factory_manager->RegisterFactory(ChromePPAPIInterfaceFactory);
954 } 959 }
955 960
956 } // namespace chrome 961 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698