Index: chrome/browser/ui/tab_helpers.cc |
diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc |
index 4caf0f5120881ef9764c973371b9882a80c90f3d..cdc128f1ade1bbfef372a9998afd143177b360d0 100644 |
--- a/chrome/browser/ui/tab_helpers.cc |
+++ b/chrome/browser/ui/tab_helpers.cc |
@@ -11,6 +11,7 @@ |
#include "build/build_config.h" |
#include "chrome/browser/bookmarks/bookmark_model_factory.h" |
#include "chrome/browser/browser_process.h" |
+#include "chrome/browser/content_settings/mixed_content_settings.h" |
#include "chrome/browser/content_settings/tab_specific_content_settings.h" |
#include "chrome/browser/data_use_measurement/data_use_web_contents_observer.h" |
#include "chrome/browser/engagement/site_engagement_helper.h" |
@@ -61,6 +62,7 @@ |
#include "components/subresource_filter/content/browser/content_subresource_filter_driver_factory.h" |
#include "components/tracing/common/tracing_switches.h" |
#include "content/public/browser/web_contents.h" |
+#include "content/public/common/browser_side_navigation_policy.h" |
#include "extensions/features/features.h" |
#include "printing/features/features.h" |
@@ -200,6 +202,8 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { |
// TODO(vabr): Remove TabSpecificContentSettings from here once their function |
// is taken over by ChromeContentSettingsClient. http://crbug.com/387075 |
TabSpecificContentSettings::CreateForWebContents(web_contents); |
+ if (content::IsBrowserSideNavigationEnabled()) |
+ MixedContentSettings::CreateForWebContents(web_contents); |
// --- Platform-specific tab helpers --- |