Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5595)

Unified Diff: chrome/browser/content_settings/mixed_content_settings.h

Issue 1905033002: PlzNavigate: Move navigation-level mixed content checks to the browser. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@console-security-message
Patch Set: Addressed all jam@ latest comments. Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/content_settings/mixed_content_settings.h
diff --git a/chrome/browser/content_settings/mixed_content_settings.h b/chrome/browser/content_settings/mixed_content_settings.h
new file mode 100644
index 0000000000000000000000000000000000000000..290913165e00dcbc805ff96590198e9d2e3ecce9
--- /dev/null
+++ b/chrome/browser/content_settings/mixed_content_settings.h
@@ -0,0 +1,48 @@
+// Copyright (c) 2016 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef CHROME_BROWSER_CONTENT_SETTINGS_MIXED_CONTENT_SETTINGS_H_
+#define CHROME_BROWSER_CONTENT_SETTINGS_MIXED_CONTENT_SETTINGS_H_
+
+#include "content/public/browser/web_contents_observer.h"
+#include "content/public/browser/web_contents_user_data.h"
+
+namespace content {
+class SiteInstance;
+class NavigationHandle;
jam 2017/01/09 21:15:46 nit: no need to forward declare a parameter to an
carlosk 2017/01/10 19:13:11 Done.
+}
+
+// Controls mixed content related settings for the associated WebContents.
+class MixedContentSettings
+ : public content::WebContentsObserver,
+ public content::WebContentsUserData<MixedContentSettings> {
+ public:
+ ~MixedContentSettings() override;
+
+ // Enables running mixed-content resources in the tab containing the specified
+ // frame. This state is reset to the default of not allowed when the main
+ // frame navigates to a different SiteInstance.
+ void AllowRunningOfInsecureContent();
+
+ bool insecure_content_allowed_running() {
+ return insecure_content_allowed_running_;
+ }
+
+ private:
+ friend class content::WebContentsUserData<MixedContentSettings>;
+
+ explicit MixedContentSettings(content::WebContents* tab);
+
+ void DidFinishNavigation(
+ content::NavigationHandle* navigation_handle) override;
+
+ // Members to control mixed-content settings for the tab. They will be reset
+ // on cross-site main frame navigations.
+ content::SiteInstance* insecure_content_site_instance_;
+ bool insecure_content_allowed_running_;
+
+ DISALLOW_COPY_AND_ASSIGN(MixedContentSettings);
+};
+
+#endif // CHROME_BROWSER_CONTENT_SETTINGS_MIXED_CONTENT_SETTINGS_H_

Powered by Google App Engine
This is Rietveld 408576698