OLD | NEW |
---|---|
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 749 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
760 host->GetChannel()->AddFilter(new ChromeNetBenchmarkingMessageFilter( | 760 host->GetChannel()->AddFilter(new ChromeNetBenchmarkingMessageFilter( |
761 id, profile, context)); | 761 id, profile, context)); |
762 host->GetChannel()->AddFilter( | 762 host->GetChannel()->AddFilter( |
763 new prerender::PrerenderMessageFilter(id, profile)); | 763 new prerender::PrerenderMessageFilter(id, profile)); |
764 host->GetChannel()->AddFilter(new ValidationMessageMessageFilter(id)); | 764 host->GetChannel()->AddFilter(new ValidationMessageMessageFilter(id)); |
765 host->GetChannel()->AddFilter(new TtsMessageFilter(id, profile)); | 765 host->GetChannel()->AddFilter(new TtsMessageFilter(id, profile)); |
766 #if defined(ENABLE_WEBRTC) | 766 #if defined(ENABLE_WEBRTC) |
767 host->GetChannel()->AddFilter(new WebRtcLoggingHandlerHost()); | 767 host->GetChannel()->AddFilter(new WebRtcLoggingHandlerHost()); |
768 #endif | 768 #endif |
769 #if !defined(DISABLE_NACL) | 769 #if !defined(DISABLE_NACL) |
770 host->GetChannel()->AddFilter(new NaClHostMessageFilter(id, profile, | 770 ExtensionInfoMap* extension_info_map = |
771 context)); | 771 extensions::ExtensionSystem::Get(profile)->info_map(); |
772 host->GetChannel()->AddFilter(new NaClHostMessageFilter(id, | |
Mark Seaborn
2013/06/26 14:45:34
Please put 'id' on the following line for readabil
| |
773 profile->IsOffTheRecord(), profile->GetPath(), extension_info_map, | |
774 context)); | |
772 #endif | 775 #endif |
773 | 776 |
774 host->Send(new ChromeViewMsg_SetIsIncognitoProcess( | 777 host->Send(new ChromeViewMsg_SetIsIncognitoProcess( |
775 profile->IsOffTheRecord())); | 778 profile->IsOffTheRecord())); |
776 | 779 |
777 host->Send(new ChromeViewMsg_SetExtensionActivityLogEnabled( | 780 host->Send(new ChromeViewMsg_SetExtensionActivityLogEnabled( |
778 IsExtensionActivityLogEnabledForProfile(profile))); | 781 IsExtensionActivityLogEnabledForProfile(profile))); |
779 | 782 |
780 SendExtensionWebRequestStatusToHost(host); | 783 SendExtensionWebRequestStatusToHost(host); |
781 | 784 |
(...skipping 1583 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2365 #if defined(USE_NSS) | 2368 #if defined(USE_NSS) |
2366 crypto::CryptoModuleBlockingPasswordDelegate* | 2369 crypto::CryptoModuleBlockingPasswordDelegate* |
2367 ChromeContentBrowserClient::GetCryptoPasswordDelegate( | 2370 ChromeContentBrowserClient::GetCryptoPasswordDelegate( |
2368 const GURL& url) { | 2371 const GURL& url) { |
2369 return chrome::NewCryptoModuleBlockingDialogDelegate( | 2372 return chrome::NewCryptoModuleBlockingDialogDelegate( |
2370 chrome::kCryptoModulePasswordKeygen, url.host()); | 2373 chrome::kCryptoModulePasswordKeygen, url.host()); |
2371 } | 2374 } |
2372 #endif | 2375 #endif |
2373 | 2376 |
2374 } // namespace chrome | 2377 } // namespace chrome |
OLD | NEW |