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

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

Issue 12041059: content: convert SSL notifications to observer usage (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 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: content/browser/ssl/ssl_manager.h
diff --git a/content/browser/ssl/ssl_manager.h b/content/browser/ssl/ssl_manager.h
index 4349a905dedc7e3244852db339685ad3c5aa95ad..3f9ac4e31d773182e97c748ecbd7c3d7fa0b714e 100644
--- a/content/browser/ssl/ssl_manager.h
+++ b/content/browser/ssl/ssl_manager.h
@@ -58,11 +58,6 @@ class SSLManager : public NotificationObserver {
const net::SSLInfo& ssl_info,
bool fatal);
- // Called when SSL state for a host or tab changes. Broadcasts the
- // SSL_INTERNAL_STATE_CHANGED notification.
- static void NotifySSLInternalStateChanged(
- NavigationControllerImpl* controller);
-
// Construct an SSLManager for the specified tab.
// If |delegate| is NULL, SSLPolicy::GetDefaultPolicy() is used.
explicit SSLManager(NavigationControllerImpl* controller);
@@ -81,8 +76,12 @@ class SSLManager : public NotificationObserver {
void DidCommitProvisionalLoad(const NotificationDetails& details);
// Insecure content entry point.
+ void DidDisplayInsecureContent();
void DidRunInsecureContent(const std::string& security_origin);
+ // Update the NavigationEntry with our current state.
+ void UpdateEntry(NavigationEntryImpl* entry);
+
// Entry point for navigation. This function begins the process of updating
// the security UI when the main frame navigates to a new URL.
//
@@ -99,10 +98,6 @@ class SSLManager : public NotificationObserver {
void DidLoadFromMemoryCache(LoadFromMemoryCacheDetails* details);
void DidStartResourceResponse(ResourceRequestDetails* details);
void DidReceiveResourceRedirect(ResourceRedirectDetails* details);
- void DidChangeSSLInternalState();
-
- // Update the NavigationEntry with our current state.
- void UpdateEntry(NavigationEntryImpl* entry);
// The backend for the SSLPolicy to actuate its decisions.
SSLPolicyBackend backend_;

Powered by Google App Engine
This is Rietveld 408576698