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

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

Issue 2063008: (Original patch reviewed at http://codereview.chromium.org/2067003 )... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 10 years, 7 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 | « chrome/browser/ssl/ssl_host_state_unittest.cc ('k') | chrome/browser/ssl/ssl_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ssl/ssl_manager.h
===================================================================
--- chrome/browser/ssl/ssl_manager.h (revision 47323)
+++ chrome/browser/ssl/ssl_manager.h (working copy)
@@ -38,18 +38,6 @@
class SSLManager : public NotificationObserver {
public:
- // Construct an SSLManager for the specified tab.
- // If |delegate| is NULL, SSLPolicy::GetDefaultPolicy() is used.
- explicit SSLManager(NavigationController* controller);
- ~SSLManager();
-
- SSLPolicy* policy() { return policy_.get(); }
- SSLPolicyBackend* backend() { return &backend_; }
-
- // The navigation controller associated with this SSLManager. The
- // NavigationController is guaranteed to outlive the SSLManager.
- NavigationController* controller() { return controller_; }
-
static void RegisterUserPrefs(PrefService* prefs);
// Entry point for SSLCertificateErrors. This function begins the process
@@ -63,26 +51,10 @@
int cert_error,
net::X509Certificate* cert);
- // Mixed content entry points.
- void DidDisplayInsecureContent();
- void DidRunInsecureContent(const std::string& security_origin);
+ // Called when SSL state for a host or tab changes. Broadcasts the
+ // SSL_INTERNAL_STATE_CHANGED notification.
+ static void NotifySSLInternalStateChanged();
- // Entry point for navigation. This function begins the process of updating
- // the security UI when the main frame navigates to a new URL.
- //
- // Called on the UI thread.
- virtual void Observe(NotificationType type,
- const NotificationSource& source,
- const NotificationDetails& details);
-
- // This entry point is called directly (instead of via the notification
- // service) because we need more precise control of the order in which folks
- // are notified of this event.
- void DidCommitProvisionalLoad(const NotificationDetails& details);
-
- // Called to determine if there were any processed SSL errors from request.
- bool ProcessedSSLErrorFromRequest() const;
-
// Convenience methods for serializing/deserializing the security info.
static std::string SerializeSecurityInfo(int cert_id,
int cert_status,
@@ -95,6 +67,37 @@
// Returns "<organization_name> [<country>]".
static std::wstring GetEVCertName(const net::X509Certificate& cert);
+ // Construct an SSLManager for the specified tab.
+ // If |delegate| is NULL, SSLPolicy::GetDefaultPolicy() is used.
+ explicit SSLManager(NavigationController* controller);
+ ~SSLManager();
+
+ SSLPolicy* policy() { return policy_.get(); }
+ SSLPolicyBackend* backend() { return &backend_; }
+
+ // The navigation controller associated with this SSLManager. The
+ // NavigationController is guaranteed to outlive the SSLManager.
+ NavigationController* controller() { return controller_; }
+
+ // This entry point is called directly (instead of via the notification
+ // service) because we need more precise control of the order in which folks
+ // are notified of this event.
+ void DidCommitProvisionalLoad(const NotificationDetails& details);
+
+ // Mixed content entry point.
+ void DidRunInsecureContent(const std::string& security_origin);
+
+ // Called to determine if there were any processed SSL errors from request.
+ bool ProcessedSSLErrorFromRequest() const;
+
+ // Entry point for navigation. This function begins the process of updating
+ // the security UI when the main frame navigates to a new URL.
+ //
+ // Called on the UI thread.
+ virtual void Observe(NotificationType type,
+ const NotificationSource& source,
+ const NotificationDetails& details);
+
private:
// SSLMessageInfo contains the information necessary for displaying a message
// in an info-bar.
@@ -130,9 +133,6 @@
void DidReceiveResourceRedirect(ResourceRedirectDetails* details);
void DidChangeSSLInternalState();
- // Dispatch NotificationType::SSL_VISIBLE_STATE_CHANGED notification.
- void DispatchSSLVisibleStateChanged();
-
// Update the NavigationEntry with our current state.
void UpdateEntry(NavigationEntry* entry);
« no previous file with comments | « chrome/browser/ssl/ssl_host_state_unittest.cc ('k') | chrome/browser/ssl/ssl_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698