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

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: Rebase 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
« no previous file with comments | « no previous file | chrome/browser/media/webrtc_logging_handler_host.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) 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 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 174
175 #if !defined(OS_CHROMEOS) 175 #if !defined(OS_CHROMEOS)
176 #include "chrome/browser/signin/signin_manager.h" 176 #include "chrome/browser/signin/signin_manager.h"
177 #include "chrome/browser/signin/signin_manager_factory.h" 177 #include "chrome/browser/signin/signin_manager_factory.h"
178 #endif 178 #endif
179 179
180 #if !defined(OS_ANDROID) 180 #if !defined(OS_ANDROID)
181 #include "chrome/browser/media_galleries/fileapi/media_file_system_mount_point_p rovider.h" 181 #include "chrome/browser/media_galleries/fileapi/media_file_system_mount_point_p rovider.h"
182 #endif 182 #endif
183 183
184 #if defined(ENABLE_WEBRTC)
185 #include "chrome/browser/media/webrtc_logging_handler_host.h"
186 #endif
187
184 using base::FileDescriptor; 188 using base::FileDescriptor;
185 using content::AccessTokenStore; 189 using content::AccessTokenStore;
186 using content::BrowserChildProcessHostIterator; 190 using content::BrowserChildProcessHostIterator;
187 using content::BrowserThread; 191 using content::BrowserThread;
188 using content::BrowserURLHandler; 192 using content::BrowserURLHandler;
189 using content::ChildProcessSecurityPolicy; 193 using content::ChildProcessSecurityPolicy;
190 using content::FileDescriptorInfo; 194 using content::FileDescriptorInfo;
191 using content::QuotaPermissionContext; 195 using content::QuotaPermissionContext;
192 using content::RenderViewHost; 196 using content::RenderViewHost;
193 using content::SiteInstance; 197 using content::SiteInstance;
(...skipping 522 matching lines...) Expand 10 before | Expand all | Expand 10 after
716 host->GetChannel()->AddFilter(new SpellCheckMessageFilter(id)); 720 host->GetChannel()->AddFilter(new SpellCheckMessageFilter(id));
717 #if defined(OS_MACOSX) 721 #if defined(OS_MACOSX)
718 host->GetChannel()->AddFilter(new SpellCheckMessageFilterMac(id)); 722 host->GetChannel()->AddFilter(new SpellCheckMessageFilterMac(id));
719 #endif 723 #endif
720 host->GetChannel()->AddFilter(new ChromeNetBenchmarkingMessageFilter( 724 host->GetChannel()->AddFilter(new ChromeNetBenchmarkingMessageFilter(
721 id, profile, context)); 725 id, profile, context));
722 host->GetChannel()->AddFilter( 726 host->GetChannel()->AddFilter(
723 new prerender::PrerenderMessageFilter(id, profile)); 727 new prerender::PrerenderMessageFilter(id, profile));
724 host->GetChannel()->AddFilter(new ValidationMessageMessageFilter(id)); 728 host->GetChannel()->AddFilter(new ValidationMessageMessageFilter(id));
725 host->GetChannel()->AddFilter(new TtsMessageFilter(id, profile)); 729 host->GetChannel()->AddFilter(new TtsMessageFilter(id, profile));
730 #if defined(ENABLE_WEBRTC)
731 host->GetChannel()->AddFilter(new WebRtcLoggingHandlerHost());
732 #endif
726 733
727 host->Send(new ChromeViewMsg_SetIsIncognitoProcess( 734 host->Send(new ChromeViewMsg_SetIsIncognitoProcess(
728 profile->IsOffTheRecord())); 735 profile->IsOffTheRecord()));
729 736
730 host->Send(new ChromeViewMsg_SetExtensionActivityLogEnabled( 737 host->Send(new ChromeViewMsg_SetExtensionActivityLogEnabled(
731 IsExtensionActivityLogEnabledForProfile(profile))); 738 IsExtensionActivityLogEnabledForProfile(profile)));
732 739
733 SendExtensionWebRequestStatusToHost(host); 740 SendExtensionWebRequestStatusToHost(host);
734 741
735 RendererContentSettingRules rules; 742 RendererContentSettingRules rules;
(...skipping 1541 matching lines...) Expand 10 before | Expand all | Expand 10 after
2277 #if defined(USE_NSS) 2284 #if defined(USE_NSS)
2278 crypto::CryptoModuleBlockingPasswordDelegate* 2285 crypto::CryptoModuleBlockingPasswordDelegate*
2279 ChromeContentBrowserClient::GetCryptoPasswordDelegate( 2286 ChromeContentBrowserClient::GetCryptoPasswordDelegate(
2280 const GURL& url) { 2287 const GURL& url) {
2281 return chrome::NewCryptoModuleBlockingDialogDelegate( 2288 return chrome::NewCryptoModuleBlockingDialogDelegate(
2282 chrome::kCryptoModulePasswordKeygen, url.host()); 2289 chrome::kCryptoModulePasswordKeygen, url.host());
2283 } 2290 }
2284 #endif 2291 #endif
2285 2292
2286 } // namespace chrome 2293 } // namespace chrome
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/media/webrtc_logging_handler_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698