diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-03-08 10:28:10 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-03-20 13:40:30 +0000 |
| commit | e733310db58160074f574c429d48f8308c0afe17 (patch) | |
| tree | f8aef4b7e62a69928dbcf880620eece20f98c6df /chromium/content/common/site_isolation_policy.cc | |
| parent | 2f583e4aec1ae3a86fa047829c96b310dc12ecdf (diff) | |
| download | qtwebengine-chromium-e733310db58160074f574c429d48f8308c0afe17.tar.gz | |
BASELINE: Update Chromium to 56.0.2924.122
Change-Id: I4e04de8f47e47e501c46ed934c76a431c6337ced
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/content/common/site_isolation_policy.cc')
| -rw-r--r-- | chromium/content/common/site_isolation_policy.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chromium/content/common/site_isolation_policy.cc b/chromium/content/common/site_isolation_policy.cc index 4ab845d60b2..015940a1ec5 100644 --- a/chromium/content/common/site_isolation_policy.cc +++ b/chromium/content/common/site_isolation_policy.cc @@ -5,9 +5,11 @@ #include "content/common/site_isolation_policy.h" #include "base/command_line.h" +#include "base/feature_list.h" #include "base/lazy_instance.h" #include "content/public/common/browser_side_navigation_policy.h" #include "content/public/common/content_client.h" +#include "content/public/common/content_features.h" #include "content/public/common/content_switches.h" namespace content { @@ -17,8 +19,7 @@ bool SiteIsolationPolicy::AreCrossProcessFramesPossible() { return UseDedicatedProcessesForAllSites() || IsTopDocumentIsolationEnabled() || GetContentClient()->IsSupplementarySiteIsolationModeEnabled() || - base::CommandLine::ForCurrentProcess()->HasSwitch( - switches::kUseCrossProcessFramesForGuests); + base::FeatureList::IsEnabled(::features::kGuestViewCrossProcessFrames); } // static |