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

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

Issue 12220100: Revert "content: convert SSL notifications to observer usage" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 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/ui/browser.cc ('k') | content/browser/ssl/ssl_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/ssl/ssl_manager.h
diff --git a/content/browser/ssl/ssl_manager.h b/content/browser/ssl/ssl_manager.h
index 8cd1668a944017821fa8995d4d747fff3bc92d40..4349a905dedc7e3244852db339685ad3c5aa95ad 100644
--- a/content/browser/ssl/ssl_manager.h
+++ b/content/browser/ssl/ssl_manager.h
@@ -25,7 +25,6 @@ class SSLInfo;
}
namespace content {
-class BrowserContext;
class NavigationEntryImpl;
class NavigationControllerImpl;
class SSLPolicy;
@@ -59,8 +58,10 @@ class SSLManager : public NotificationObserver {
const net::SSLInfo& ssl_info,
bool fatal);
- // Called when SSL state for a host or tab changes.
- static void NotifySSLInternalStateChanged(BrowserContext* context);
+ // 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.
@@ -80,7 +81,6 @@ class SSLManager : public NotificationObserver {
void DidCommitProvisionalLoad(const NotificationDetails& details);
// Insecure content entry point.
- void DidDisplayInsecureContent();
void DidRunInsecureContent(const std::string& security_origin);
// Entry point for navigation. This function begins the process of updating
@@ -99,6 +99,7 @@ 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);
« no previous file with comments | « chrome/browser/ui/browser.cc ('k') | content/browser/ssl/ssl_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698