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

Side by Side Diff: content/browser/renderer_host/render_process_host_impl.cc

Issue 9805001: Move media/audio files into media namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix various compiler errors Created 8 years, 9 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 // Represents the browser side of the browser <--> renderer communication 5 // Represents the browser side of the browser <--> renderer communication
6 // channel. There will be one RenderProcessHost per renderer process. 6 // channel. There will be one RenderProcessHost per renderer process.
7 7
8 #include "content/browser/renderer_host/render_process_host_impl.h" 8 #include "content/browser/renderer_host/render_process_host_impl.h"
9 9
10 #if defined(OS_WIN) 10 #if defined(OS_WIN)
(...skipping 450 matching lines...) Expand 10 before | Expand all | Expand 10 after
461 browser_context->GetResourceContext(); 461 browser_context->GetResourceContext();
462 462
463 ResourceMessageFilter* resource_message_filter = new ResourceMessageFilter( 463 ResourceMessageFilter* resource_message_filter = new ResourceMessageFilter(
464 GetID(), content::PROCESS_TYPE_RENDERER, resource_context, 464 GetID(), content::PROCESS_TYPE_RENDERER, resource_context,
465 new RendererURLRequestContextSelector(browser_context, GetID())); 465 new RendererURLRequestContextSelector(browser_context, GetID()));
466 466
467 channel_->AddFilter(resource_message_filter); 467 channel_->AddFilter(resource_message_filter);
468 #if !defined(OS_ANDROID) 468 #if !defined(OS_ANDROID)
469 // TODO(dtrainor, klobag): Enable this when content::BrowserMainLoop gets 469 // TODO(dtrainor, klobag): Enable this when content::BrowserMainLoop gets
470 // included in Android builds. Tracked via 115941. 470 // included in Android builds. Tracked via 115941.
471 AudioManager* audio_manager = content::BrowserMainLoop::GetAudioManager(); 471 media::AudioManager* audio_manager =
472 content::BrowserMainLoop::GetAudioManager();
472 channel_->AddFilter(new AudioInputRendererHost( 473 channel_->AddFilter(new AudioInputRendererHost(
473 resource_context, audio_manager)); 474 resource_context, audio_manager));
474 channel_->AddFilter(new AudioRendererHost(resource_context, audio_manager)); 475 channel_->AddFilter(new AudioRendererHost(resource_context, audio_manager));
475 channel_->AddFilter(new VideoCaptureHost(resource_context, audio_manager)); 476 channel_->AddFilter(new VideoCaptureHost(resource_context, audio_manager));
476 #endif 477 #endif
477 channel_->AddFilter(new AppCacheDispatcherHost( 478 channel_->AddFilter(new AppCacheDispatcherHost(
478 static_cast<ChromeAppCacheService*>( 479 static_cast<ChromeAppCacheService*>(
479 BrowserContext::GetAppCacheService(browser_context)), 480 BrowserContext::GetAppCacheService(browser_context)),
480 GetID())); 481 GetID()));
481 channel_->AddFilter(new ClipboardMessageFilter()); 482 channel_->AddFilter(new ClipboardMessageFilter());
(...skipping 854 matching lines...) Expand 10 before | Expand all | Expand 10 after
1336 void RenderProcessHostImpl::OnRevealFolderInOS(const FilePath& path) { 1337 void RenderProcessHostImpl::OnRevealFolderInOS(const FilePath& path) {
1337 // Only honor the request if appropriate persmissions are granted. 1338 // Only honor the request if appropriate persmissions are granted.
1338 if (ChildProcessSecurityPolicyImpl::GetInstance()->CanReadFile(GetID(), 1339 if (ChildProcessSecurityPolicyImpl::GetInstance()->CanReadFile(GetID(),
1339 path)) 1340 path))
1340 content::GetContentClient()->browser()->OpenItem(path); 1341 content::GetContentClient()->browser()->OpenItem(path);
1341 } 1342 }
1342 1343
1343 void RenderProcessHostImpl::OnSavedPageAsMHTML(int job_id, int64 data_size) { 1344 void RenderProcessHostImpl::OnSavedPageAsMHTML(int job_id, int64 data_size) {
1344 MHTMLGenerationManager::GetInstance()->MHTMLGenerated(job_id, data_size); 1345 MHTMLGenerationManager::GetInstance()->MHTMLGenerated(job_id, data_size);
1345 } 1346 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698