OLD | NEW |
---|---|
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "content/common/site_isolation_policy.h" | 5 #include "content/common/site_isolation_policy.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/lazy_instance.h" | 8 #include "base/lazy_instance.h" |
9 #include "content/public/common/content_client.h" | 9 #include "content/public/common/content_client.h" |
10 #include "content/public/common/content_switches.h" | 10 #include "content/public/common/content_switches.h" |
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
65 | 65 |
66 // static | 66 // static |
67 bool SiteIsolationPolicy::UseSubframeNavigationEntries() { | 67 bool SiteIsolationPolicy::UseSubframeNavigationEntries() { |
68 // Enable the new navigation history behavior if any manner of site isolation | 68 // Enable the new navigation history behavior if any manner of site isolation |
69 // is active. | 69 // is active. |
70 return AreCrossProcessFramesPossible(); | 70 return AreCrossProcessFramesPossible(); |
71 } | 71 } |
72 | 72 |
73 // static | 73 // static |
74 bool SiteIsolationPolicy::IsSwappedOutStateForbidden() { | 74 bool SiteIsolationPolicy::IsSwappedOutStateForbidden() { |
75 #if defined(OS_ANDROID) | |
Charlie Reis
2015/09/29 19:58:22
nit: TODO(nasko): Fix Android issues and remove th
nasko
2015/09/29 22:36:13
Done.
| |
75 return AreCrossProcessFramesPossible(); | 76 return AreCrossProcessFramesPossible(); |
77 #else | |
78 return true; | |
79 #endif | |
76 } | 80 } |
77 | 81 |
78 // static | 82 // static |
79 bool SiteIsolationPolicy::IsolateAllSitesForTesting() { | 83 bool SiteIsolationPolicy::IsolateAllSitesForTesting() { |
80 // TODO(nick): Re-enable once https://crbug.com/133403 is fixed. | 84 // TODO(nick): Re-enable once https://crbug.com/133403 is fixed. |
81 // if (!(g_site_isolation_whitelist == nullptr)) return false; | 85 // if (!(g_site_isolation_whitelist == nullptr)) return false; |
82 base::CommandLine::ForCurrentProcess()->AppendSwitch( | 86 base::CommandLine::ForCurrentProcess()->AppendSwitch( |
83 switches::kSitePerProcess); | 87 switches::kSitePerProcess); |
84 return true; | 88 return true; |
85 } | 89 } |
86 | 90 |
87 } // namespace content | 91 } // namespace content |
OLD | NEW |