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

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

Issue 8980008: Integrate HTMLMediaElement with Web Audio API's MediaElementAudioSourceNode (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 8 years, 12 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 | chrome/renderer/prerender/prerender_webmediaplayer.h » ('j') | 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 285 matching lines...) Expand 10 before | Expand all | Expand 10 after
296 WebKit::WebMediaPlayerClient* client, 296 WebKit::WebMediaPlayerClient* client,
297 base::WeakPtr<webkit_media::WebMediaPlayerDelegate> delegate, 297 base::WeakPtr<webkit_media::WebMediaPlayerDelegate> delegate,
298 media::FilterCollection* collection, 298 media::FilterCollection* collection,
299 media::MessageLoopFactory* message_loop_factory, 299 media::MessageLoopFactory* message_loop_factory,
300 webkit_media::MediaStreamClient* media_stream_client, 300 webkit_media::MediaStreamClient* media_stream_client,
301 media::MediaLog* media_log, 301 media::MediaLog* media_log,
302 webkit_media::WebMediaPlayerImpl** player) { 302 webkit_media::WebMediaPlayerImpl** player) {
303 if (!prerender::PrerenderHelper::IsPrerendering(render_view)) 303 if (!prerender::PrerenderHelper::IsPrerendering(render_view))
304 return false; 304 return false;
305 305
306 CommandLine* cmd = CommandLine::ForCurrentProcess();
307 bool disable_audio = cmd->HasSwitch(switches::kDisableAudio);
acolwell GONE FROM CHROMIUM 2011/12/22 17:43:27 Hmm.. I was thinking that PrerenderWebMediaPlayer'
Chris Rogers 2011/12/22 20:57:33 Hi Aaron, sorry I'm not quite following you here.
acolwell GONE FROM CHROMIUM 2011/12/22 21:48:49 Sorry. Nevermind. This code is fine as is. I think
306 *player = new prerender::PrerenderWebMediaPlayer(render_view, client, 308 *player = new prerender::PrerenderWebMediaPlayer(render_view, client,
307 delegate, collection, message_loop_factory, media_stream_client, 309 delegate, collection, disable_audio, message_loop_factory,
308 media_log); 310 media_stream_client, media_log);
309 return true; 311 return true;
310 } 312 }
311 313
312 WebPlugin* ChromeContentRendererClient::CreatePlugin( 314 WebPlugin* ChromeContentRendererClient::CreatePlugin(
313 content::RenderView* render_view, 315 content::RenderView* render_view,
314 WebFrame* frame, 316 WebFrame* frame,
315 const WebPluginParams& original_params) { 317 const WebPluginParams& original_params) {
316 CommandLine* cmd = CommandLine::ForCurrentProcess(); 318 CommandLine* cmd = CommandLine::ForCurrentProcess();
317 GURL url(original_params.url); 319 GURL url(original_params.url);
318 std::string orig_mime_type = original_params.mimeType.utf8(); 320 std::string orig_mime_type = original_params.mimeType.utf8();
(...skipping 491 matching lines...) Expand 10 before | Expand all | Expand 10 after
810 webkit::ppapi::PpapiInterfaceFactoryManager* factory_manager) { 812 webkit::ppapi::PpapiInterfaceFactoryManager* factory_manager) {
811 factory_manager->RegisterFactory(ChromePPAPIInterfaceFactory); 813 factory_manager->RegisterFactory(ChromePPAPIInterfaceFactory);
812 } 814 }
813 815
814 bool ChromeContentRendererClient::AllowSocketAPI(const GURL& url) { 816 bool ChromeContentRendererClient::AllowSocketAPI(const GURL& url) {
815 return allowed_socket_origins_.find(url.host()) != 817 return allowed_socket_origins_.find(url.host()) !=
816 allowed_socket_origins_.end(); 818 allowed_socket_origins_.end();
817 } 819 }
818 820
819 } // namespace chrome 821 } // namespace chrome
OLDNEW
« no previous file with comments | « no previous file | chrome/renderer/prerender/prerender_webmediaplayer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698