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

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

Issue 11414138: Encrypted Media: No NeedKey if --enable-encrypted-media is not set. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years 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
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 368 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 media::FilterCollection* collection,
385 WebKit::WebAudioSourceProvider* audio_source_provider, 385 WebKit::WebAudioSourceProvider* audio_source_provider,
386 media::AudioRendererSink* audio_renderer_sink, 386 media::AudioRendererSink* audio_renderer_sink,
387 media::MessageLoopFactory* message_loop_factory, 387 media::MessageLoopFactory* message_loop_factory,
388 webkit_media::MediaStreamClient* media_stream_client, 388 webkit_media::MediaStreamClient* media_stream_client,
389 bool encrypted_media_enabled,
389 media::MediaLog* media_log) { 390 media::MediaLog* media_log) {
390 #if defined(OS_ANDROID) 391 #if defined(OS_ANDROID)
391 // Chromium for Android doesn't support prerender yet. 392 // Chromium for Android doesn't support prerender yet.
392 return NULL; 393 return NULL;
393 #else 394 #else
394 if (!prerender::PrerenderHelper::IsPrerendering(render_view)) 395 if (!prerender::PrerenderHelper::IsPrerendering(render_view))
395 return NULL; 396 return NULL;
396 397
397 return new prerender::PrerenderWebMediaPlayer(render_view, frame, client, 398 return new prerender::PrerenderWebMediaPlayer(render_view, frame, client,
398 delegate, collection, audio_source_provider, audio_renderer_sink, 399 delegate, collection, audio_source_provider, audio_renderer_sink,
399 message_loop_factory, media_stream_client, media_log); 400 message_loop_factory, media_stream_client, encrypted_media_enabled,
401 media_log);
400 #endif 402 #endif
401 } 403 }
402 404
403 WebPlugin* ChromeContentRendererClient::CreatePlugin( 405 WebPlugin* ChromeContentRendererClient::CreatePlugin(
404 content::RenderView* render_view, 406 content::RenderView* render_view,
405 WebFrame* frame, 407 WebFrame* frame,
406 const WebPluginParams& original_params, 408 const WebPluginParams& original_params,
407 const ChromeViewHostMsg_GetPluginInfo_Output& output) { 409 const ChromeViewHostMsg_GetPluginInfo_Output& output) {
408 const ChromeViewHostMsg_GetPluginInfo_Status& status = output.status; 410 const ChromeViewHostMsg_GetPluginInfo_Status& status = output.status;
409 const webkit::WebPluginInfo& plugin = output.plugin; 411 const webkit::WebPluginInfo& plugin = output.plugin;
(...skipping 606 matching lines...) Expand 10 before | Expand all | Expand 10 after
1016 bool ChromeContentRendererClient::IsOtherExtensionWithWebRequestInstalled() { 1018 bool ChromeContentRendererClient::IsOtherExtensionWithWebRequestInstalled() {
1017 return extension_dispatcher_->IsOtherExtensionWithWebRequestInstalled(); 1019 return extension_dispatcher_->IsOtherExtensionWithWebRequestInstalled();
1018 } 1020 }
1019 1021
1020 void ChromeContentRendererClient::RegisterPPAPIInterfaceFactories( 1022 void ChromeContentRendererClient::RegisterPPAPIInterfaceFactories(
1021 webkit::ppapi::PpapiInterfaceFactoryManager* factory_manager) { 1023 webkit::ppapi::PpapiInterfaceFactoryManager* factory_manager) {
1022 factory_manager->RegisterFactory(ChromePPAPIInterfaceFactory); 1024 factory_manager->RegisterFactory(ChromePPAPIInterfaceFactory);
1023 } 1025 }
1024 1026
1025 } // namespace chrome 1027 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698