| 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 940 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 951 return chrome::CreateWebContentsViewDelegate(web_contents); | 951 return chrome::CreateWebContentsViewDelegate(web_contents); |
| 952 } | 952 } |
| 953 | 953 |
| 954 void ChromeContentBrowserClient::RenderProcessWillLaunch( | 954 void ChromeContentBrowserClient::RenderProcessWillLaunch( |
| 955 content::RenderProcessHost* host) { | 955 content::RenderProcessHost* host) { |
| 956 int id = host->GetID(); | 956 int id = host->GetID(); |
| 957 Profile* profile = Profile::FromBrowserContext(host->GetBrowserContext()); | 957 Profile* profile = Profile::FromBrowserContext(host->GetBrowserContext()); |
| 958 net::URLRequestContextGetter* context = | 958 net::URLRequestContextGetter* context = |
| 959 host->GetStoragePartition()->GetURLRequestContext(); | 959 host->GetStoragePartition()->GetURLRequestContext(); |
| 960 | 960 |
| 961 host->AddFilter(new ChromeRenderMessageFilter( | 961 host->AddFilter(new ChromeRenderMessageFilter(id, profile)); |
| 962 id, profile, host->GetStoragePartition()->GetServiceWorkerContext())); | |
| 963 #if defined(ENABLE_EXTENSIONS) | 962 #if defined(ENABLE_EXTENSIONS) |
| 964 host->AddFilter(new cast::CastTransportHostFilter); | 963 host->AddFilter(new cast::CastTransportHostFilter); |
| 965 #endif | 964 #endif |
| 966 #if defined(ENABLE_PRINTING) | 965 #if defined(ENABLE_PRINTING) |
| 967 host->AddFilter(new printing::PrintingMessageFilter(id, profile)); | 966 host->AddFilter(new printing::PrintingMessageFilter(id, profile)); |
| 968 #endif | 967 #endif |
| 969 host->AddOwnedInterface( | 968 host->AddOwnedInterface( |
| 970 base::MakeUnique<SearchProviderInstallStateImpl>(id, profile), | 969 base::MakeUnique<SearchProviderInstallStateImpl>(id, profile), |
| 971 &SearchProviderInstallStateImpl::Bind, | 970 &SearchProviderInstallStateImpl::Bind, |
| 972 content::BrowserThread::GetTaskRunnerForThread( | 971 content::BrowserThread::GetTaskRunnerForThread( |
| (...skipping 2081 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3054 if (channel <= kMaxDisableEncryptionChannel) { | 3053 if (channel <= kMaxDisableEncryptionChannel) { |
| 3055 static const char* const kWebRtcDevSwitchNames[] = { | 3054 static const char* const kWebRtcDevSwitchNames[] = { |
| 3056 switches::kDisableWebRtcEncryption, | 3055 switches::kDisableWebRtcEncryption, |
| 3057 }; | 3056 }; |
| 3058 to_command_line->CopySwitchesFrom(from_command_line, | 3057 to_command_line->CopySwitchesFrom(from_command_line, |
| 3059 kWebRtcDevSwitchNames, | 3058 kWebRtcDevSwitchNames, |
| 3060 arraysize(kWebRtcDevSwitchNames)); | 3059 arraysize(kWebRtcDevSwitchNames)); |
| 3061 } | 3060 } |
| 3062 } | 3061 } |
| 3063 #endif // defined(ENABLE_WEBRTC) | 3062 #endif // defined(ENABLE_WEBRTC) |
| OLD | NEW |