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

Unified Diff: content/browser/ssl/ssl_manager.cc

Issue 1259253009: Revert of Attach a SecurityStyle to each request in ResourceLoader (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 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
« no previous file with comments | « content/browser/ssl/ssl_manager.h ('k') | content/browser/ssl/ssl_policy.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/ssl/ssl_manager.cc
diff --git a/content/browser/ssl/ssl_manager.cc b/content/browser/ssl/ssl_manager.cc
index e4c71e3dc4e0f8b2c520afe4cb9d9979d51140d9..ab1048c31404dc35e1eb261f1aab427c8d76f10e 100644
--- a/content/browser/ssl/ssl_manager.cc
+++ b/content/browser/ssl/ssl_manager.cc
@@ -121,10 +121,7 @@
}
}
- policy()->UpdateEntry(entry, controller_->delegate()->GetWebContents());
- // Always notify the WebContents that the SSL state changed when a
- // load is committed, in case the active navigation entry has changed.
- NotifyDidChangeVisibleSSLState();
+ UpdateEntry(entry);
}
void SSLManager::DidDisplayInsecureContent() {
@@ -187,16 +184,12 @@
SSLStatus original_ssl_status = entry->GetSSL(); // Copy!
- policy()->UpdateEntry(entry, controller_->delegate()->GetWebContents());
+ WebContentsImpl* contents =
+ static_cast<WebContentsImpl*>(controller_->delegate()->GetWebContents());
+ policy()->UpdateEntry(entry, contents);
if (!entry->GetSSL().Equals(original_ssl_status))
- NotifyDidChangeVisibleSSLState();
-}
-
-void SSLManager::NotifyDidChangeVisibleSSLState() {
- WebContentsImpl* contents =
- static_cast<WebContentsImpl*>(controller_->delegate()->GetWebContents());
- contents->DidChangeVisibleSSLState();
+ contents->DidChangeVisibleSSLState();
}
} // namespace content
« no previous file with comments | « content/browser/ssl/ssl_manager.h ('k') | content/browser/ssl/ssl_policy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698