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 751 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
762 host->GetChannel()->AddFilter(new ChromeNetBenchmarkingMessageFilter( | 762 host->GetChannel()->AddFilter(new ChromeNetBenchmarkingMessageFilter( |
763 id, profile, context)); | 763 id, profile, context)); |
764 host->GetChannel()->AddFilter( | 764 host->GetChannel()->AddFilter( |
765 new prerender::PrerenderMessageFilter(id, profile)); | 765 new prerender::PrerenderMessageFilter(id, profile)); |
766 host->GetChannel()->AddFilter(new ValidationMessageMessageFilter(id)); | 766 host->GetChannel()->AddFilter(new ValidationMessageMessageFilter(id)); |
767 host->GetChannel()->AddFilter(new TtsMessageFilter(id, profile)); | 767 host->GetChannel()->AddFilter(new TtsMessageFilter(id, profile)); |
768 #if defined(ENABLE_WEBRTC) | 768 #if defined(ENABLE_WEBRTC) |
769 host->GetChannel()->AddFilter(new WebRtcLoggingHandlerHost()); | 769 host->GetChannel()->AddFilter(new WebRtcLoggingHandlerHost()); |
770 #endif | 770 #endif |
771 #if !defined(DISABLE_NACL) | 771 #if !defined(DISABLE_NACL) |
772 host->GetChannel()->AddFilter(new NaClHostMessageFilter(id, profile, | 772 ExtensionInfoMap* extension_info_map = |
773 context)); | 773 extensions::ExtensionSystem::Get(profile)->info_map(); |
| 774 host->GetChannel()->AddFilter(new NaClHostMessageFilter( |
| 775 id, profile->IsOffTheRecord(), |
| 776 profile->GetPath(), extension_info_map, |
| 777 context)); |
774 #endif | 778 #endif |
775 | 779 |
776 host->Send(new ChromeViewMsg_SetIsIncognitoProcess( | 780 host->Send(new ChromeViewMsg_SetIsIncognitoProcess( |
777 profile->IsOffTheRecord())); | 781 profile->IsOffTheRecord())); |
778 | 782 |
779 host->Send(new ChromeViewMsg_SetExtensionActivityLogEnabled( | 783 host->Send(new ChromeViewMsg_SetExtensionActivityLogEnabled( |
780 IsExtensionActivityLogEnabledForProfile(profile))); | 784 IsExtensionActivityLogEnabledForProfile(profile))); |
781 | 785 |
782 SendExtensionWebRequestStatusToHost(host); | 786 SendExtensionWebRequestStatusToHost(host); |
783 | 787 |
(...skipping 1596 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2380 #if defined(USE_NSS) | 2384 #if defined(USE_NSS) |
2381 crypto::CryptoModuleBlockingPasswordDelegate* | 2385 crypto::CryptoModuleBlockingPasswordDelegate* |
2382 ChromeContentBrowserClient::GetCryptoPasswordDelegate( | 2386 ChromeContentBrowserClient::GetCryptoPasswordDelegate( |
2383 const GURL& url) { | 2387 const GURL& url) { |
2384 return chrome::NewCryptoModuleBlockingDialogDelegate( | 2388 return chrome::NewCryptoModuleBlockingDialogDelegate( |
2385 chrome::kCryptoModulePasswordKeygen, url.host()); | 2389 chrome::kCryptoModulePasswordKeygen, url.host()); |
2386 } | 2390 } |
2387 #endif | 2391 #endif |
2388 | 2392 |
2389 } // namespace chrome | 2393 } // namespace chrome |
OLD | NEW |