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 750 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
761 bool can_be_default, | 761 bool can_be_default, |
762 std::string* partition_domain, | 762 std::string* partition_domain, |
763 std::string* partition_name, | 763 std::string* partition_name, |
764 bool* in_memory) { | 764 bool* in_memory) { |
765 // Default to the browser-wide storage partition and override based on |site| | 765 // Default to the browser-wide storage partition and override based on |site| |
766 // below. | 766 // below. |
767 partition_domain->clear(); | 767 partition_domain->clear(); |
768 partition_name->clear(); | 768 partition_name->clear(); |
769 *in_memory = false; | 769 *in_memory = false; |
770 | 770 |
771 bool success = GuestViewBase::GetGuestPartitionConfigForSite( | 771 bool success = WebViewGuest::GetGuestPartitionConfigForSite( |
772 site, partition_domain, partition_name, in_memory); | 772 site, partition_domain, partition_name, in_memory); |
773 | 773 |
774 if (!success && site.SchemeIs(extensions::kExtensionScheme)) { | 774 if (!success && site.SchemeIs(extensions::kExtensionScheme)) { |
775 // If |can_be_default| is false, the caller is stating that the |site| | 775 // If |can_be_default| is false, the caller is stating that the |site| |
776 // should be parsed as if it had isolated storage. In particular it is | 776 // should be parsed as if it had isolated storage. In particular it is |
777 // important to NOT check ExtensionService for the is_storage_isolated() | 777 // important to NOT check ExtensionService for the is_storage_isolated() |
778 // attribute because this code path is run during Extension uninstall | 778 // attribute because this code path is run during Extension uninstall |
779 // to do cleanup after the Extension has already been unloaded from the | 779 // to do cleanup after the Extension has already been unloaded from the |
780 // ExtensionService. | 780 // ExtensionService. |
781 bool is_isolated = !can_be_default; | 781 bool is_isolated = !can_be_default; |
(...skipping 1974 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2756 switches::kDisableWebRtcEncryption, | 2756 switches::kDisableWebRtcEncryption, |
2757 }; | 2757 }; |
2758 to_command_line->CopySwitchesFrom(from_command_line, | 2758 to_command_line->CopySwitchesFrom(from_command_line, |
2759 kWebRtcDevSwitchNames, | 2759 kWebRtcDevSwitchNames, |
2760 arraysize(kWebRtcDevSwitchNames)); | 2760 arraysize(kWebRtcDevSwitchNames)); |
2761 } | 2761 } |
2762 } | 2762 } |
2763 #endif // defined(ENABLE_WEBRTC) | 2763 #endif // defined(ENABLE_WEBRTC) |
2764 | 2764 |
2765 } // namespace chrome | 2765 } // namespace chrome |
OLD | NEW |