Chromium Code Reviews| Index: ios/chrome/browser/ssl/ios_security_state_tab_helper.mm |
| diff --git a/ios/chrome/browser/ssl/ios_security_state_tab_helper.mm b/ios/chrome/browser/ssl/ios_security_state_tab_helper.mm |
| index c4634660888ef58e851462c958bc0cc6df82f97c..be63f28163cbe17ad9ad26ec8e2cafb6c903ffe9 100644 |
| --- a/ios/chrome/browser/ssl/ios_security_state_tab_helper.mm |
| +++ b/ios/chrome/browser/ssl/ios_security_state_tab_helper.mm |
| @@ -10,6 +10,7 @@ |
| #include "base/metrics/field_trial.h" |
| #include "base/metrics/histogram_macros.h" |
| #include "components/security_state/core/security_state.h" |
| +#include "ios/web/public/browser_state.h" |
| #include "ios/web/public/navigation_item.h" |
| #import "ios/web/public/navigation_manager.h" |
| #import "ios/web/public/origin_util.h" |
| @@ -62,5 +63,10 @@ IOSSecurityStateTabHelper::GetVisibleSecurityState() const { |
| (ssl.content_status & web::SSLStatus::DISPLAYED_CREDIT_CARD_FIELD_ON_HTTP) |
| ? true |
| : false; |
| + if (!state->certificate && |
|
estark
2017/06/13 22:47:11
This conditional can go away now, right?
Also, we
Eugene But (OOO till 7-30)
2017/06/14 01:18:10
iOS team would really appreciate the test, which s
elawrence
2017/06/14 17:01:39
#oops. Fixed.
elawrence
2017/06/14 17:01:39
Will do this in a followup. crbug.com/733311
|
| + security_state::IsHttpWarningForIncognitoEnabled()) { |
| + state->is_incognito = web_state_->GetBrowserState()->IsOffTheRecord(); |
| + } |
| + |
| return state; |
| } |