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 <map> | 7 #include <map> |
8 #include <set> | 8 #include <set> |
9 #include <utility> | 9 #include <utility> |
10 #include <vector> | 10 #include <vector> |
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
65 #include "chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.h" | 65 #include "chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.h" |
66 #include "chrome/browser/profiles/profile.h" | 66 #include "chrome/browser/profiles/profile.h" |
67 #include "chrome/browser/profiles/profile_io_data.h" | 67 #include "chrome/browser/profiles/profile_io_data.h" |
68 #include "chrome/browser/renderer_host/chrome_render_message_filter.h" | 68 #include "chrome/browser/renderer_host/chrome_render_message_filter.h" |
69 #include "chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory
.h" | 69 #include "chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory
.h" |
70 #include "chrome/browser/safe_browsing/safe_browsing_service.h" | 70 #include "chrome/browser/safe_browsing/safe_browsing_service.h" |
71 #include "chrome/browser/safe_browsing/ui_manager.h" | 71 #include "chrome/browser/safe_browsing/ui_manager.h" |
72 #include "chrome/browser/search/instant_service.h" | 72 #include "chrome/browser/search/instant_service.h" |
73 #include "chrome/browser/search/instant_service_factory.h" | 73 #include "chrome/browser/search/instant_service_factory.h" |
74 #include "chrome/browser/search/search.h" | 74 #include "chrome/browser/search/search.h" |
75 #include "chrome/browser/search_engines/search_provider_install_state_message_fi
lter.h" | 75 #include "chrome/browser/search_engines/search_provider_install_state_impl.h" |
76 #include "chrome/browser/speech/chrome_speech_recognition_manager_delegate.h" | 76 #include "chrome/browser/speech/chrome_speech_recognition_manager_delegate.h" |
77 #include "chrome/browser/speech/tts_controller.h" | 77 #include "chrome/browser/speech/tts_controller.h" |
78 #include "chrome/browser/speech/tts_message_filter.h" | 78 #include "chrome/browser/speech/tts_message_filter.h" |
79 #include "chrome/browser/ssl/ssl_add_certificate.h" | 79 #include "chrome/browser/ssl/ssl_add_certificate.h" |
80 #include "chrome/browser/ssl/ssl_blocking_page.h" | 80 #include "chrome/browser/ssl/ssl_blocking_page.h" |
81 #include "chrome/browser/ssl/ssl_cert_reporter.h" | 81 #include "chrome/browser/ssl/ssl_cert_reporter.h" |
82 #include "chrome/browser/ssl/ssl_client_certificate_selector.h" | 82 #include "chrome/browser/ssl/ssl_client_certificate_selector.h" |
83 #include "chrome/browser/ssl/ssl_error_handler.h" | 83 #include "chrome/browser/ssl/ssl_error_handler.h" |
84 #include "chrome/browser/sync_file_system/local/sync_file_system_backend.h" | 84 #include "chrome/browser/sync_file_system/local/sync_file_system_backend.h" |
85 #include "chrome/browser/tab_contents/tab_util.h" | 85 #include "chrome/browser/tab_contents/tab_util.h" |
(...skipping 881 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
967 net::URLRequestContextGetter* context = | 967 net::URLRequestContextGetter* context = |
968 host->GetStoragePartition()->GetURLRequestContext(); | 968 host->GetStoragePartition()->GetURLRequestContext(); |
969 | 969 |
970 host->AddFilter(new ChromeRenderMessageFilter(id, profile)); | 970 host->AddFilter(new ChromeRenderMessageFilter(id, profile)); |
971 #if defined(ENABLE_EXTENSIONS) | 971 #if defined(ENABLE_EXTENSIONS) |
972 host->AddFilter(new cast::CastTransportHostFilter); | 972 host->AddFilter(new cast::CastTransportHostFilter); |
973 #endif | 973 #endif |
974 #if defined(ENABLE_PRINTING) | 974 #if defined(ENABLE_PRINTING) |
975 host->AddFilter(new printing::PrintingMessageFilter(id, profile)); | 975 host->AddFilter(new printing::PrintingMessageFilter(id, profile)); |
976 #endif | 976 #endif |
977 host->AddFilter(new SearchProviderInstallStateMessageFilter(id, profile)); | 977 host->AddOwnedInterface( |
| 978 base::MakeUnique<SearchProviderInstallStateImpl>(id, profile), |
| 979 &SearchProviderInstallStateImpl::Bind, |
| 980 content::BrowserThread::GetTaskRunnerForThread( |
| 981 content::BrowserThread::IO)); |
978 #if defined(ENABLE_SPELLCHECK) | 982 #if defined(ENABLE_SPELLCHECK) |
979 host->AddFilter(new SpellCheckMessageFilter(id)); | 983 host->AddFilter(new SpellCheckMessageFilter(id)); |
980 #endif | 984 #endif |
981 #if defined(USE_BROWSER_SPELLCHECKER) | 985 #if defined(USE_BROWSER_SPELLCHECKER) |
982 host->AddFilter(new SpellCheckMessageFilterPlatform(id)); | 986 host->AddFilter(new SpellCheckMessageFilterPlatform(id)); |
983 #endif | 987 #endif |
984 host->AddFilter(new ChromeNetBenchmarkingMessageFilter(profile, context)); | 988 host->AddFilter(new ChromeNetBenchmarkingMessageFilter(profile, context)); |
985 host->AddFilter(new prerender::PrerenderMessageFilter(id, profile)); | 989 host->AddFilter(new prerender::PrerenderMessageFilter(id, profile)); |
986 host->AddFilter(new TtsMessageFilter(host->GetBrowserContext())); | 990 host->AddFilter(new TtsMessageFilter(host->GetBrowserContext())); |
987 #if defined(ENABLE_WEBRTC) | 991 #if defined(ENABLE_WEBRTC) |
(...skipping 2059 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3047 if (channel <= kMaxDisableEncryptionChannel) { | 3051 if (channel <= kMaxDisableEncryptionChannel) { |
3048 static const char* const kWebRtcDevSwitchNames[] = { | 3052 static const char* const kWebRtcDevSwitchNames[] = { |
3049 switches::kDisableWebRtcEncryption, | 3053 switches::kDisableWebRtcEncryption, |
3050 }; | 3054 }; |
3051 to_command_line->CopySwitchesFrom(from_command_line, | 3055 to_command_line->CopySwitchesFrom(from_command_line, |
3052 kWebRtcDevSwitchNames, | 3056 kWebRtcDevSwitchNames, |
3053 arraysize(kWebRtcDevSwitchNames)); | 3057 arraysize(kWebRtcDevSwitchNames)); |
3054 } | 3058 } |
3055 } | 3059 } |
3056 #endif // defined(ENABLE_WEBRTC) | 3060 #endif // defined(ENABLE_WEBRTC) |
OLD | NEW |