Chromium Code Reviews| 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 669 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 680 #endif | 680 #endif |
| 681 | 681 |
| 682 chrome::AddMetricsExtraParts(main_parts); | 682 chrome::AddMetricsExtraParts(main_parts); |
| 683 | 683 |
| 684 return main_parts; | 684 return main_parts; |
| 685 } | 685 } |
| 686 | 686 |
| 687 std::string ChromeContentBrowserClient::GetStoragePartitionIdForSite( | 687 std::string ChromeContentBrowserClient::GetStoragePartitionIdForSite( |
| 688 content::BrowserContext* browser_context, | 688 content::BrowserContext* browser_context, |
| 689 const GURL& site) { | 689 const GURL& site) { |
| 690 std::string partition_id; | 690 std::string partition_id = Profile::FromBrowserContext(browser_context) |
| 691 | 691 ->GetStoragePartitionIdForSite(site); |
|
Charlie Reis
2013/07/31 17:16:16
nit: Arrow on previous line to be consistent (e.g.
jochen (gone - plz use gerrit)
2013/07/31 18:30:52
Done.
| |
| 692 // The partition ID for webview guest processes is the string value of its | |
| 693 // SiteInstance URL - "chrome-guest://app_id/persist?partition". | |
| 694 if (site.SchemeIs(chrome::kGuestScheme)) | |
| 695 partition_id = site.spec(); | |
| 696 | 692 |
| 697 DCHECK(IsValidStoragePartitionId(browser_context, partition_id)); | 693 DCHECK(IsValidStoragePartitionId(browser_context, partition_id)); |
| 698 return partition_id; | 694 return partition_id; |
| 699 } | 695 } |
| 700 | 696 |
| 701 bool ChromeContentBrowserClient::IsValidStoragePartitionId( | 697 bool ChromeContentBrowserClient::IsValidStoragePartitionId( |
| 702 content::BrowserContext* browser_context, | 698 content::BrowserContext* browser_context, |
| 703 const std::string& partition_id) { | 699 const std::string& partition_id) { |
| 704 // The default ID is empty and is always valid. | 700 // The default ID is empty and is always valid. |
| 705 if (partition_id.empty()) | 701 if (partition_id.empty()) |
| (...skipping 1873 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2579 #if defined(USE_NSS) | 2575 #if defined(USE_NSS) |
| 2580 crypto::CryptoModuleBlockingPasswordDelegate* | 2576 crypto::CryptoModuleBlockingPasswordDelegate* |
| 2581 ChromeContentBrowserClient::GetCryptoPasswordDelegate( | 2577 ChromeContentBrowserClient::GetCryptoPasswordDelegate( |
| 2582 const GURL& url) { | 2578 const GURL& url) { |
| 2583 return chrome::NewCryptoModuleBlockingDialogDelegate( | 2579 return chrome::NewCryptoModuleBlockingDialogDelegate( |
| 2584 chrome::kCryptoModulePasswordKeygen, url.host()); | 2580 chrome::kCryptoModulePasswordKeygen, url.host()); |
| 2585 } | 2581 } |
| 2586 #endif | 2582 #endif |
| 2587 | 2583 |
| 2588 } // namespace chrome | 2584 } // namespace chrome |
| OLD | NEW |