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

Unified Diff: content/browser/web_contents/web_contents_impl.cc

Issue 12041059: content: convert SSL notifications to observer usage (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix 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/web_contents/web_contents_impl.cc
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 94705b180107bf001366e6eea2cb13612dad9e47..cdf43334e40d200e154bbd1620e2211d94aeca7b 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -2161,7 +2161,7 @@ void WebContentsImpl::OnDidLoadResourceFromMemoryCache(
void WebContentsImpl::OnDidDisplayInsecureContent() {
RecordAction(UserMetricsAction("SSL.DisplayedInsecureContent"));
displayed_insecure_content_ = true;
- SSLManager::NotifySSLInternalStateChanged(&GetController());
+ controller_.ssl_manager()->DidDisplayInsecureContent();
}
void WebContentsImpl::OnDidRunInsecureContent(
@@ -2173,7 +2173,6 @@ void WebContentsImpl::OnDidRunInsecureContent(
RecordAction(UserMetricsAction("SSL.RanInsecureContentGoogle"));
controller_.ssl_manager()->DidRunInsecureContent(security_origin);
displayed_insecure_content_ = true;
- SSLManager::NotifySSLInternalStateChanged(&GetController());
}
void WebContentsImpl::OnDocumentLoadedInFrame(int64 frame_id) {
@@ -2447,6 +2446,11 @@ void WebContentsImpl::DidBlock3DAPIs(const GURL& url,
DidBlock3DAPIs(url, requester));
}
+void WebContentsImpl::DidChangeVisibleSSLState() {
+ FOR_EACH_OBSERVER(WebContentsObserver, observers_,
+ DidChangeVisibleSSLState());
+}
+
// Notifies the RenderWidgetHost instance about the fact that the page is
// loading, or done loading and calls the base implementation.
void WebContentsImpl::SetIsLoading(bool is_loading,

Powered by Google App Engine
This is Rietveld 408576698