| 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 784 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 795 | 795 |
| 796 if (is_isolated) { | 796 if (is_isolated) { |
| 797 CHECK(site.has_host()); | 797 CHECK(site.has_host()); |
| 798 // For extensions with isolated storage, the the host of the |site| is | 798 // For extensions with isolated storage, the the host of the |site| is |
| 799 // the |partition_domain|. The |in_memory| and |partition_name| are only | 799 // the |partition_domain|. The |in_memory| and |partition_name| are only |
| 800 // used in guest schemes so they are cleared here. | 800 // used in guest schemes so they are cleared here. |
| 801 *partition_domain = site.host(); | 801 *partition_domain = site.host(); |
| 802 *in_memory = false; | 802 *in_memory = false; |
| 803 partition_name->clear(); | 803 partition_name->clear(); |
| 804 } | 804 } |
| 805 } else if (site.GetOrigin().spec() == kChromeUIChromeSigninURL) { | |
| 806 // Chrome signin page has an embedded iframe of extension and web content, | |
| 807 // thus it must be isolated from other webUI pages. | |
| 808 *partition_domain = chrome::kChromeUIChromeSigninHost; | |
| 809 } | 805 } |
| 810 | 806 |
| 811 // Assert that if |can_be_default| is false, the code above must have found a | 807 // Assert that if |can_be_default| is false, the code above must have found a |
| 812 // non-default partition. If this fails, the caller has a serious logic | 808 // non-default partition. If this fails, the caller has a serious logic |
| 813 // error about which StoragePartition they expect to be in and it is not | 809 // error about which StoragePartition they expect to be in and it is not |
| 814 // safe to continue. | 810 // safe to continue. |
| 815 CHECK(can_be_default || !partition_domain->empty()); | 811 CHECK(can_be_default || !partition_domain->empty()); |
| 816 } | 812 } |
| 817 | 813 |
| 818 content::WebContentsViewDelegate* | 814 content::WebContentsViewDelegate* |
| (...skipping 1887 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2706 // releases of Chrome. Permitting "Unknown" allows these APIs to be used on | 2702 // releases of Chrome. Permitting "Unknown" allows these APIs to be used on |
| 2707 // Chromium builds as well. | 2703 // Chromium builds as well. |
| 2708 return channel <= chrome::VersionInfo::CHANNEL_DEV; | 2704 return channel <= chrome::VersionInfo::CHANNEL_DEV; |
| 2709 #else | 2705 #else |
| 2710 return false; | 2706 return false; |
| 2711 #endif | 2707 #endif |
| 2712 } | 2708 } |
| 2713 | 2709 |
| 2714 | 2710 |
| 2715 } // namespace chrome | 2711 } // namespace chrome |
| OLD | NEW |