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/browser_plugin_guest_mode.h" | 9 #include "content/public/common/browser_plugin_guest_mode.h" |
10 #include "content/public/common/browser_side_navigation_policy.h" | 10 #include "content/public/common/browser_side_navigation_policy.h" |
(...skipping 21 matching lines...) Expand all Loading... |
32 // --site-per-process trumps --top-document-isolation. | 32 // --site-per-process trumps --top-document-isolation. |
33 if (UseDedicatedProcessesForAllSites()) | 33 if (UseDedicatedProcessesForAllSites()) |
34 return false; | 34 return false; |
35 | 35 |
36 return base::CommandLine::ForCurrentProcess()->HasSwitch( | 36 return base::CommandLine::ForCurrentProcess()->HasSwitch( |
37 switches::kTopDocumentIsolation); | 37 switches::kTopDocumentIsolation); |
38 } | 38 } |
39 | 39 |
40 // static | 40 // static |
41 bool SiteIsolationPolicy::UseSubframeNavigationEntries() { | 41 bool SiteIsolationPolicy::UseSubframeNavigationEntries() { |
42 // Enable the new navigation history behavior if any manner of site isolation | 42 return true; |
43 // is active. | |
44 // PlzNavigate: also enable the new navigation history behavior. | |
45 return AreCrossProcessFramesPossible() || IsBrowserSideNavigationEnabled(); | |
46 } | 43 } |
47 | 44 |
48 } // namespace content | 45 } // namespace content |
OLD | NEW |