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

Unified Diff: Source/devtools/front_end/security/SecurityModel.js

Issue 1316853002: Organize security panel main view. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Remove experiment toggle. Created 5 years, 4 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: Source/devtools/front_end/security/SecurityModel.js
diff --git a/Source/devtools/front_end/security/SecurityModel.js b/Source/devtools/front_end/security/SecurityModel.js
index cdd7dc2332578e4fbfb459f5deb44c373bda96eb..d0058571ee2c60a7bbfa0066d805e7ef4088d897 100644
--- a/Source/devtools/front_end/security/SecurityModel.js
+++ b/Source/devtools/front_end/security/SecurityModel.js
@@ -60,10 +60,27 @@ WebInspector.SecurityDispatcher.prototype = {
* @override
* @param {!SecurityAgent.SecurityState} securityState
* @param {!Array<!SecurityAgent.SecurityStateExplanation>=} explanations
+ * @param {!SecurityAgent.MixedContentStatus=} mixedContentStatus
+ * @param {boolean=} schemeIsCryptographic
*/
- securityStateChanged: function(securityState, explanations)
+ securityStateChanged: function(securityState, explanations, mixedContentStatus, schemeIsCryptographic)
{
var data = {"securityState": securityState, "explanations": explanations || []};
+ if (schemeIsCryptographic && mixedContentStatus) {
+ if (mixedContentStatus.ranInsecureContent) {
+ explanations.push({
+ "securityState": mixedContentStatus.ranInsecureContentStyle,
+ "summary": WebInspector.UIString("Active Mixed Content"),
+ "description": WebInspector.UIString("You have recently allowed insecure content (such as scripts or iframes) to run on this site.")
+ });
+ } else if (mixedContentStatus.displayedInsecureContent) {
+ explanations.push({
+ "securityState": mixedContentStatus.displayedInsecureContentStyle,
+ "summary": WebInspector.UIString("Mixed Content"),
+ "description": WebInspector.UIString("The site includes HTTP resources.")
+ });
+ }
+ }
this._model.dispatchEventToListeners(WebInspector.SecurityModel.EventTypes.SecurityStateChanged, data);
}
}
« no previous file with comments | « Source/devtools/front_end/Images/securityStateWarning_2x.png ('k') | Source/devtools/front_end/security/SecurityPanel.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698