| 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 969 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 980 base::Bind(&ChromeRenderMessageFilter::BindNetworkHints, | 980 base::Bind(&ChromeRenderMessageFilter::BindNetworkHints, |
| 981 base::Unretained(chrome_render_filter)), | 981 base::Unretained(chrome_render_filter)), |
| 982 BrowserThread::GetTaskRunnerForThread(BrowserThread::IO)); | 982 BrowserThread::GetTaskRunnerForThread(BrowserThread::IO)); |
| 983 host->AddFilter(chrome_render_filter); | 983 host->AddFilter(chrome_render_filter); |
| 984 #if defined(ENABLE_EXTENSIONS) | 984 #if defined(ENABLE_EXTENSIONS) |
| 985 host->AddFilter(new cast::CastTransportHostFilter); | 985 host->AddFilter(new cast::CastTransportHostFilter); |
| 986 #endif | 986 #endif |
| 987 #if defined(ENABLE_PRINTING) | 987 #if defined(ENABLE_PRINTING) |
| 988 host->AddFilter(new printing::PrintingMessageFilter(id, profile)); | 988 host->AddFilter(new printing::PrintingMessageFilter(id, profile)); |
| 989 #endif | 989 #endif |
| 990 host->AddOwnedInterface( | 990 host->GetInterfaceRegistry()->AddInterface( |
| 991 base::MakeUnique<SearchProviderInstallStateImpl>(id, profile), | 991 base::Bind(&SearchProviderInstallStateImpl::Create, id, profile), |
| 992 &SearchProviderInstallStateImpl::Bind, | |
| 993 content::BrowserThread::GetTaskRunnerForThread( | 992 content::BrowserThread::GetTaskRunnerForThread( |
| 994 content::BrowserThread::IO)); | 993 content::BrowserThread::UI)); |
| 995 #if defined(ENABLE_SPELLCHECK) | 994 #if defined(ENABLE_SPELLCHECK) |
| 996 host->AddFilter(new SpellCheckMessageFilter(id)); | 995 host->AddFilter(new SpellCheckMessageFilter(id)); |
| 997 #endif | 996 #endif |
| 998 #if defined(USE_BROWSER_SPELLCHECKER) | 997 #if defined(USE_BROWSER_SPELLCHECKER) |
| 999 host->AddFilter(new SpellCheckMessageFilterPlatform(id)); | 998 host->AddFilter(new SpellCheckMessageFilterPlatform(id)); |
| 1000 #endif | 999 #endif |
| 1001 host->AddFilter(new ChromeNetBenchmarkingMessageFilter(profile, context)); | 1000 host->AddFilter(new ChromeNetBenchmarkingMessageFilter(profile, context)); |
| 1002 host->AddFilter(new prerender::PrerenderMessageFilter(id, profile)); | 1001 host->AddFilter(new prerender::PrerenderMessageFilter(id, profile)); |
| 1003 host->AddFilter(new TtsMessageFilter(host->GetBrowserContext())); | 1002 host->AddFilter(new TtsMessageFilter(host->GetBrowserContext())); |
| 1004 #if defined(ENABLE_WEBRTC) | 1003 #if defined(ENABLE_WEBRTC) |
| (...skipping 2078 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3083 if (channel <= kMaxDisableEncryptionChannel) { | 3082 if (channel <= kMaxDisableEncryptionChannel) { |
| 3084 static const char* const kWebRtcDevSwitchNames[] = { | 3083 static const char* const kWebRtcDevSwitchNames[] = { |
| 3085 switches::kDisableWebRtcEncryption, | 3084 switches::kDisableWebRtcEncryption, |
| 3086 }; | 3085 }; |
| 3087 to_command_line->CopySwitchesFrom(from_command_line, | 3086 to_command_line->CopySwitchesFrom(from_command_line, |
| 3088 kWebRtcDevSwitchNames, | 3087 kWebRtcDevSwitchNames, |
| 3089 arraysize(kWebRtcDevSwitchNames)); | 3088 arraysize(kWebRtcDevSwitchNames)); |
| 3090 } | 3089 } |
| 3091 } | 3090 } |
| 3092 #endif // defined(ENABLE_WEBRTC) | 3091 #endif // defined(ENABLE_WEBRTC) |
| OLD | NEW |