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

Side by Side Diff: chrome/browser/chrome_content_browser_client.cc

Issue 15741003: Moving WebRTC logging related files from content to chrome. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Code review. Created 7 years, 6 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/browser/chrome_content_browser_client.h" 5 #include "chrome/browser/chrome_content_browser_client.h"
6 6
7 #include <set> 7 #include <set>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 175
176 #if !defined(OS_CHROMEOS) 176 #if !defined(OS_CHROMEOS)
177 #include "chrome/browser/signin/signin_manager.h" 177 #include "chrome/browser/signin/signin_manager.h"
178 #include "chrome/browser/signin/signin_manager_factory.h" 178 #include "chrome/browser/signin/signin_manager_factory.h"
179 #endif 179 #endif
180 180
181 #if !defined(OS_ANDROID) 181 #if !defined(OS_ANDROID)
182 #include "chrome/browser/media_galleries/fileapi/media_file_system_mount_point_p rovider.h" 182 #include "chrome/browser/media_galleries/fileapi/media_file_system_mount_point_p rovider.h"
183 #endif 183 #endif
184 184
185 #if defined(ENABLE_WEBRTC)
186 #include "chrome/browser/media/webrtc_logging_handler_host.h"
187 #endif
188
185 using base::FileDescriptor; 189 using base::FileDescriptor;
186 using content::AccessTokenStore; 190 using content::AccessTokenStore;
187 using content::BrowserChildProcessHostIterator; 191 using content::BrowserChildProcessHostIterator;
188 using content::BrowserThread; 192 using content::BrowserThread;
189 using content::BrowserURLHandler; 193 using content::BrowserURLHandler;
190 using content::ChildProcessSecurityPolicy; 194 using content::ChildProcessSecurityPolicy;
191 using content::FileDescriptorInfo; 195 using content::FileDescriptorInfo;
192 using content::QuotaPermissionContext; 196 using content::QuotaPermissionContext;
193 using content::RenderViewHost; 197 using content::RenderViewHost;
194 using content::SiteInstance; 198 using content::SiteInstance;
(...skipping 528 matching lines...) Expand 10 before | Expand all | Expand 10 after
723 host->GetChannel()->AddFilter(new SpellCheckMessageFilter(id)); 727 host->GetChannel()->AddFilter(new SpellCheckMessageFilter(id));
724 #if defined(OS_MACOSX) 728 #if defined(OS_MACOSX)
725 host->GetChannel()->AddFilter(new SpellCheckMessageFilterMac(id)); 729 host->GetChannel()->AddFilter(new SpellCheckMessageFilterMac(id));
726 #endif 730 #endif
727 host->GetChannel()->AddFilter(new ChromeNetBenchmarkingMessageFilter( 731 host->GetChannel()->AddFilter(new ChromeNetBenchmarkingMessageFilter(
728 id, profile, context)); 732 id, profile, context));
729 host->GetChannel()->AddFilter( 733 host->GetChannel()->AddFilter(
730 new prerender::PrerenderMessageFilter(id, profile)); 734 new prerender::PrerenderMessageFilter(id, profile));
731 host->GetChannel()->AddFilter(new ValidationMessageMessageFilter(id)); 735 host->GetChannel()->AddFilter(new ValidationMessageMessageFilter(id));
732 host->GetChannel()->AddFilter(new TtsMessageFilter(id, profile)); 736 host->GetChannel()->AddFilter(new TtsMessageFilter(id, profile));
737 #if defined(ENABLE_WEBRTC)
738 host->GetChannel()->AddFilter(new WebRtcLoggingHandlerHost());
739 #endif
733 740
734 host->Send(new ChromeViewMsg_SetIsIncognitoProcess( 741 host->Send(new ChromeViewMsg_SetIsIncognitoProcess(
735 profile->IsOffTheRecord())); 742 profile->IsOffTheRecord()));
736 743
737 host->Send(new ChromeViewMsg_SetExtensionActivityLogEnabled( 744 host->Send(new ChromeViewMsg_SetExtensionActivityLogEnabled(
738 IsExtensionActivityLogEnabledForProfile(profile))); 745 IsExtensionActivityLogEnabledForProfile(profile)));
739 746
740 SendExtensionWebRequestStatusToHost(host); 747 SendExtensionWebRequestStatusToHost(host);
741 748
742 RendererContentSettingRules rules; 749 RendererContentSettingRules rules;
(...skipping 1584 matching lines...) Expand 10 before | Expand all | Expand 10 after
2327 #if defined(USE_NSS) 2334 #if defined(USE_NSS)
2328 crypto::CryptoModuleBlockingPasswordDelegate* 2335 crypto::CryptoModuleBlockingPasswordDelegate*
2329 ChromeContentBrowserClient::GetCryptoPasswordDelegate( 2336 ChromeContentBrowserClient::GetCryptoPasswordDelegate(
2330 const GURL& url) { 2337 const GURL& url) {
2331 return chrome::NewCryptoModuleBlockingDialogDelegate( 2338 return chrome::NewCryptoModuleBlockingDialogDelegate(
2332 chrome::kCryptoModulePasswordKeygen, url.host()); 2339 chrome::kCryptoModulePasswordKeygen, url.host());
2333 } 2340 }
2334 #endif 2341 #endif
2335 2342
2336 } // namespace chrome 2343 } // namespace chrome
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/media/webrtc_logging_handler_host.h » ('j') | chrome/browser/media/webrtc_logging_handler_host.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698