summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authorabarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-17 10:08:24 +0000
committerabarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-17 10:08:24 +0000
commitb4a19ea2e5e85b15eb611770200a3eb76566b03a (patch)
treef4b8489110562fcf03cd32499987d7635016e556 /chrome/browser
parentfc3f1b63a9bfd577600364b89899171a18f84101 (diff)
downloadchromium_src-b4a19ea2e5e85b15eb611770200a3eb76566b03a.zip
chromium_src-b4a19ea2e5e85b15eb611770200a3eb76566b03a.tar.gz
chromium_src-b4a19ea2e5e85b15eb611770200a3eb76566b03a.tar.bz2
SSLPolicy Fix: Step 5.
Add a new notification type to notify other SSLManagers when a security origin becomes contaminated with mixed content. TBR=wtc BUG=8706 Review URL: http://codereview.chromium.org/48059 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11853 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/browser.cc6
-rw-r--r--chrome/browser/ssl/ssl_manager.cc2
-rw-r--r--chrome/browser/ssl/ssl_policy.cc6
3 files changed, 7 insertions, 7 deletions
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc
index 6c5a2c6..c1915aa 100644
--- a/chrome/browser/browser.cc
+++ b/chrome/browser/browser.cc
@@ -183,7 +183,7 @@ Browser::Browser(Type type, Profile* profile)
NotificationService::current()->AddObserver(
this,
- NotificationType::SSL_STATE_CHANGED,
+ NotificationType::SSL_VISIBLE_STATE_CHANGED,
NotificationService::AllSources());
InitCommandState();
@@ -228,7 +228,7 @@ Browser::~Browser() {
NotificationService::current()->RemoveObserver(
this,
- NotificationType::SSL_STATE_CHANGED,
+ NotificationType::SSL_VISIBLE_STATE_CHANGED,
NotificationService::AllSources());
if (profile_->IsOffTheRecord() &&
@@ -1932,7 +1932,7 @@ void Browser::Observe(NotificationType type,
}
break;
- case NotificationType::SSL_STATE_CHANGED:
+ case NotificationType::SSL_VISIBLE_STATE_CHANGED:
// When the current tab's SSL state changes, we need to update the URL
// bar to reflect the new state. Note that it's possible for the selected
// tab contents to be NULL. This is because we listen for all sources
diff --git a/chrome/browser/ssl/ssl_manager.cc b/chrome/browser/ssl/ssl_manager.cc
index 42fc860..f10a344 100644
--- a/chrome/browser/ssl/ssl_manager.cc
+++ b/chrome/browser/ssl/ssl_manager.cc
@@ -633,7 +633,7 @@ void SSLManager::DidCommitProvisionalLoad(
if (changed) {
// Only send the notification when something actually changed.
NotificationService::current()->Notify(
- NotificationType::SSL_STATE_CHANGED,
+ NotificationType::SSL_VISIBLE_STATE_CHANGED,
Source<NavigationController>(controller_),
NotificationService::NoDetails());
}
diff --git a/chrome/browser/ssl/ssl_policy.cc b/chrome/browser/ssl/ssl_policy.cc
index 6e627fb..599f45c 100644
--- a/chrome/browser/ssl/ssl_policy.cc
+++ b/chrome/browser/ssl/ssl_policy.cc
@@ -267,7 +267,7 @@ class DefaultPolicy : public SSLPolicy {
if (error->manager()->SetMaxSecurityStyle(
SECURITY_STYLE_AUTHENTICATION_BROKEN)) {
NotificationService::current()->Notify(
- NotificationType::SSL_STATE_CHANGED,
+ NotificationType::SSL_VISIBLE_STATE_CHANGED,
Source<NavigationController>(error->manager()->controller()),
Details<NavigationEntry>(
error->manager()->controller()->GetActiveEntry()));
@@ -322,7 +322,7 @@ class DefaultPolicy : public SSLPolicy {
AddMessageToConsole(msg, MESSAGE_LEVEL_WARNING);
NotificationService::current()->Notify(
- NotificationType::SSL_STATE_CHANGED,
+ NotificationType::SSL_VISIBLE_STATE_CHANGED,
Source<NavigationController>(navigation_controller),
Details<NavigationEntry>(entry));
}
@@ -420,7 +420,7 @@ void SSLPolicy::OnRequestStarted(SSLManager* manager, const GURL& url,
if (changed) {
// Only send the notification when something actually changed.
NotificationService::current()->Notify(
- NotificationType::SSL_STATE_CHANGED,
+ NotificationType::SSL_VISIBLE_STATE_CHANGED,
Source<NavigationController>(manager->controller()),
NotificationService::NoDetails());
}