Follow-up refactor of #3808

Auditors: @diracdeltas

Test Plan: N/A

docs/state.md

@@ -274,7 +274,7 @@ WindowStore
       },
       isExtendedValidation: boolean, // is using https ev
       runInsecureContent: boolean, // has active mixed content
-      blockedRunInsecureContent: string, // first domain of blocked active mixed content
+      blockedRunInsecureContent: Array<string> // sources of blocked active mixed content
     },
     parentFrameKey: number, // the key of the frame this frame was opened from
     modalPromptDetail: {...},

docs/windowActions.md

@@ -755,7 +755,7 @@ Sets the manage autofill credit card popup detail
 
 ### setBlockedRunInsecureContent(frameProps, source) 
 
-Sets page url with blocked active mixed content.
+Sets source of blocked active mixed content.
 
 **Parameters**
 

js/actions/windowActions.js

@@ -974,7 +974,7 @@ const windowActions = {
   },
 
   /**
-   * Sets page url with blocked active mixed content.
+   * Sets source of blocked active mixed content.
    * @param {Object} frameProps - The frame to set source of
    * blocked active mixed content on
    * @param {string} source - Source of blocked active mixed content

js/components/frame.js

@@ -592,7 +592,7 @@ class Frame extends ImmutableComponent {
       }
     })
     this.webview.addEventListener('did-block-run-insecure-content', (e) => {
-      windowActions.setBlockedRunInsecureContent(this.frame, this.props.location)
+      windowActions.setBlockedRunInsecureContent(this.frame, e.details[0])
     })
     this.webview.addEventListener('context-menu', (e) => {
       contextMenus.onMainContextMenu(e.params, this.frame)

js/components/siteInfo.js

@@ -19,9 +19,9 @@ class SiteInfo extends ImmutableComponent {
     this.onDenyRunInsecureContent = this.onDenyRunInsecureContent.bind(this)
   }
   onAllowRunInsecureContent () {
-    appActions.changeSiteSetting(siteUtil.getOrigin(this.isBlockedRunInsecureContent),
+    appActions.changeSiteSetting(siteUtil.getOrigin(this.location),
       'runInsecureContent', true, this.isPrivate)
-    ipc.emit(messages.SHORTCUT_ACTIVE_FRAME_LOAD_URL, {}, this.isBlockedRunInsecureContent)
+    ipc.emit(messages.SHORTCUT_ACTIVE_FRAME_LOAD_URL, {}, this.location)
     this.props.onHide()
   }
   onDenyRunInsecureContent () {

js/stores/windowStore.js

@@ -764,8 +764,11 @@ const doAction = (action) => {
       const blockedRunInsecureContentPath =
         ['frames', FrameStateUtil.getFramePropsIndex(windowState.get('frames'), action.frameProps)]
       if (action.source) {
+        let blockedList = windowState.getIn(
+          blockedRunInsecureContentPath.concat(['security', 'blockedRunInsecureContent'])) || new Immutable.List()
         windowState =
-          windowState.setIn(blockedRunInsecureContentPath.concat(['security', 'blockedRunInsecureContent']), action.source)
+          windowState.setIn(blockedRunInsecureContentPath.concat(['security', 'blockedRunInsecureContent']),
+            blockedList.push(action.source))
       } else {
         windowState =
           windowState.deleteIn(blockedRunInsecureContentPath.concat(['security', 'blockedRunInsecureContent']))