| 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 962 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 973 site_instance->GetBrowserContext()); | 973 site_instance->GetBrowserContext()); |
| 974 if (!profile) | 974 if (!profile) |
| 975 return; | 975 return; |
| 976 | 976 |
| 977 // Remember the ID of the Instant process to signal the renderer process | 977 // Remember the ID of the Instant process to signal the renderer process |
| 978 // on startup in |AppendExtraCommandLineSwitches| below. | 978 // on startup in |AppendExtraCommandLineSwitches| below. |
| 979 if (chrome::ShouldAssignURLToInstantRenderer( | 979 if (chrome::ShouldAssignURLToInstantRenderer( |
| 980 site_instance->GetSiteURL(), profile)) { | 980 site_instance->GetSiteURL(), profile)) { |
| 981 InstantService* instant_service = | 981 InstantService* instant_service = |
| 982 InstantServiceFactory::GetForProfile(profile); | 982 InstantServiceFactory::GetForProfile(profile); |
| 983 if (instant_service) | 983 if (instant_service) { |
| 984 instant_service->AddInstantProcess(site_instance->GetProcess()->GetID()); | 984 instant_service->AddInstantProcess(site_instance->GetProcess()->GetID(), |
| 985 site_instance->GetSiteURL()); |
| 986 } |
| 985 } | 987 } |
| 986 | 988 |
| 987 // We only expect there to be one signin process as we use process-per-site | 989 // We only expect there to be one signin process as we use process-per-site |
| 988 // for signin URLs. The signin process will be cleared from SigninManager | 990 // for signin URLs. The signin process will be cleared from SigninManager |
| 989 // when the renderer is destroyed. | 991 // when the renderer is destroyed. |
| 990 if (SigninManager::IsWebBasedSigninFlowURL(site_instance->GetSiteURL())) { | 992 if (SigninManager::IsWebBasedSigninFlowURL(site_instance->GetSiteURL())) { |
| 991 SigninManager* signin_manager = | 993 SigninManager* signin_manager = |
| 992 SigninManagerFactory::GetForProfile(profile); | 994 SigninManagerFactory::GetForProfile(profile); |
| 993 if (signin_manager) | 995 if (signin_manager) |
| 994 signin_manager->SetSigninProcess(site_instance->GetProcess()->GetID()); | 996 signin_manager->SetSigninProcess(site_instance->GetProcess()->GetID()); |
| (...skipping 1205 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2200 #if defined(USE_NSS) | 2202 #if defined(USE_NSS) |
| 2201 crypto::CryptoModuleBlockingPasswordDelegate* | 2203 crypto::CryptoModuleBlockingPasswordDelegate* |
| 2202 ChromeContentBrowserClient::GetCryptoPasswordDelegate( | 2204 ChromeContentBrowserClient::GetCryptoPasswordDelegate( |
| 2203 const GURL& url) { | 2205 const GURL& url) { |
| 2204 return chrome::NewCryptoModuleBlockingDialogDelegate( | 2206 return chrome::NewCryptoModuleBlockingDialogDelegate( |
| 2205 chrome::kCryptoModulePasswordKeygen, url.host()); | 2207 chrome::kCryptoModulePasswordKeygen, url.host()); |
| 2206 } | 2208 } |
| 2207 #endif | 2209 #endif |
| 2208 | 2210 |
| 2209 } // namespace chrome | 2211 } // namespace chrome |
| OLD | NEW |