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 28 matching lines...) Expand all Loading... |
39 #include "chrome/browser/extensions/extension_process_manager.h" | 39 #include "chrome/browser/extensions/extension_process_manager.h" |
40 #include "chrome/browser/extensions/extension_service.h" | 40 #include "chrome/browser/extensions/extension_service.h" |
41 #include "chrome/browser/extensions/extension_system.h" | 41 #include "chrome/browser/extensions/extension_system.h" |
42 #include "chrome/browser/extensions/extension_web_ui.h" | 42 #include "chrome/browser/extensions/extension_web_ui.h" |
43 #include "chrome/browser/extensions/extension_webkit_preferences.h" | 43 #include "chrome/browser/extensions/extension_webkit_preferences.h" |
44 #include "chrome/browser/extensions/suggest_permission_util.h" | 44 #include "chrome/browser/extensions/suggest_permission_util.h" |
45 #include "chrome/browser/geolocation/chrome_access_token_store.h" | 45 #include "chrome/browser/geolocation/chrome_access_token_store.h" |
46 #include "chrome/browser/google/google_util.h" | 46 #include "chrome/browser/google/google_util.h" |
47 #include "chrome/browser/media/media_capture_devices_dispatcher.h" | 47 #include "chrome/browser/media/media_capture_devices_dispatcher.h" |
48 #include "chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h" | 48 #include "chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h" |
| 49 #include "chrome/browser/nacl_host/nacl_host_message_filter.h" |
49 #include "chrome/browser/nacl_host/nacl_process_host.h" | 50 #include "chrome/browser/nacl_host/nacl_process_host.h" |
50 #include "chrome/browser/net/chrome_net_log.h" | 51 #include "chrome/browser/net/chrome_net_log.h" |
51 #include "chrome/browser/notifications/desktop_notification_service.h" | 52 #include "chrome/browser/notifications/desktop_notification_service.h" |
52 #include "chrome/browser/notifications/desktop_notification_service_factory.h" | 53 #include "chrome/browser/notifications/desktop_notification_service_factory.h" |
53 #include "chrome/browser/pepper_permission_util.h" | 54 #include "chrome/browser/pepper_permission_util.h" |
54 #include "chrome/browser/platform_util.h" | 55 #include "chrome/browser/platform_util.h" |
55 #include "chrome/browser/plugins/plugin_info_message_filter.h" | 56 #include "chrome/browser/plugins/plugin_info_message_filter.h" |
56 #include "chrome/browser/prefs/scoped_user_pref_update.h" | 57 #include "chrome/browser/prefs/scoped_user_pref_update.h" |
57 #include "chrome/browser/prerender/prerender_manager.h" | 58 #include "chrome/browser/prerender/prerender_manager.h" |
58 #include "chrome/browser/prerender/prerender_manager_factory.h" | 59 #include "chrome/browser/prerender/prerender_manager_factory.h" |
(...skipping 668 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
727 #endif | 728 #endif |
728 host->GetChannel()->AddFilter(new ChromeNetBenchmarkingMessageFilter( | 729 host->GetChannel()->AddFilter(new ChromeNetBenchmarkingMessageFilter( |
729 id, profile, context)); | 730 id, profile, context)); |
730 host->GetChannel()->AddFilter( | 731 host->GetChannel()->AddFilter( |
731 new prerender::PrerenderMessageFilter(id, profile)); | 732 new prerender::PrerenderMessageFilter(id, profile)); |
732 host->GetChannel()->AddFilter(new ValidationMessageMessageFilter(id)); | 733 host->GetChannel()->AddFilter(new ValidationMessageMessageFilter(id)); |
733 host->GetChannel()->AddFilter(new TtsMessageFilter(id, profile)); | 734 host->GetChannel()->AddFilter(new TtsMessageFilter(id, profile)); |
734 #if defined(ENABLE_WEBRTC) | 735 #if defined(ENABLE_WEBRTC) |
735 host->GetChannel()->AddFilter(new WebRtcLoggingHandlerHost()); | 736 host->GetChannel()->AddFilter(new WebRtcLoggingHandlerHost()); |
736 #endif | 737 #endif |
| 738 #if !defined(DISABLE_NACL) |
| 739 host->GetChannel()->AddFilter(new NaClHostMessageFilter(id, profile, |
| 740 context)); |
| 741 #endif |
737 | 742 |
738 host->Send(new ChromeViewMsg_SetIsIncognitoProcess( | 743 host->Send(new ChromeViewMsg_SetIsIncognitoProcess( |
739 profile->IsOffTheRecord())); | 744 profile->IsOffTheRecord())); |
740 | 745 |
741 host->Send(new ChromeViewMsg_SetExtensionActivityLogEnabled( | 746 host->Send(new ChromeViewMsg_SetExtensionActivityLogEnabled( |
742 IsExtensionActivityLogEnabledForProfile(profile))); | 747 IsExtensionActivityLogEnabledForProfile(profile))); |
743 | 748 |
744 SendExtensionWebRequestStatusToHost(host); | 749 SendExtensionWebRequestStatusToHost(host); |
745 | 750 |
746 RendererContentSettingRules rules; | 751 RendererContentSettingRules rules; |
(...skipping 1550 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2297 #if defined(USE_NSS) | 2302 #if defined(USE_NSS) |
2298 crypto::CryptoModuleBlockingPasswordDelegate* | 2303 crypto::CryptoModuleBlockingPasswordDelegate* |
2299 ChromeContentBrowserClient::GetCryptoPasswordDelegate( | 2304 ChromeContentBrowserClient::GetCryptoPasswordDelegate( |
2300 const GURL& url) { | 2305 const GURL& url) { |
2301 return chrome::NewCryptoModuleBlockingDialogDelegate( | 2306 return chrome::NewCryptoModuleBlockingDialogDelegate( |
2302 chrome::kCryptoModulePasswordKeygen, url.host()); | 2307 chrome::kCryptoModulePasswordKeygen, url.host()); |
2303 } | 2308 } |
2304 #endif | 2309 #endif |
2305 | 2310 |
2306 } // namespace chrome | 2311 } // namespace chrome |
OLD | NEW |