Skip to content
This repository has been archived by the owner on Dec 11, 2019. It is now read-only.

Commit

Permalink
Show URLbar icon as insecure when active mixed content is loaded
Browse files Browse the repository at this point in the history
address #5516

Auditors: @darkdh

Test Plan:
1. go to https://mixed-script.badssl.com/
2. click lock icon to allow mixed content
3. observe urlbar shows up as insecure
  • Loading branch information
diracdeltas committed Nov 9, 2016
1 parent 5cf9cc5 commit 67099bd
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion js/components/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -967,7 +967,8 @@ class Main extends ImmutableComponent {
partitionNumber={activeFrame && activeFrame.get('partitionNumber') || 0}
history={activeFrame && activeFrame.get('history') || emptyList}
suggestionIndex={activeFrame && activeFrame.getIn(['navbar', 'urlbar', 'suggestions', 'selectedIndex']) || 0}
isSecure={activeFrame && activeFrame.getIn(['security', 'isSecure'])}
isSecure={activeFrame && activeFrame.getIn(['security', 'isSecure']) &&
!activeFrame.getIn(['security', 'runInsecureContent'])}
locationValueSuffix={activeFrame && activeFrame.getIn(['navbar', 'urlbar', 'suggestions', 'urlSuffix']) || ''}
startLoadTime={activeFrame && activeFrame.get('startLoadTime') || undefined}
endLoadTime={activeFrame && activeFrame.get('endLoadTime') || undefined}
Expand Down

1 comment on commit 67099bd

@darkdh
Copy link
Member

@darkdh darkdh commented on 67099bd Nov 10, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

++

Please sign in to comment.