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

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: 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 07231f6472a0b739ac1c79f5aecb13943a350825..9fbf52e175e869c2691da187c65df4bfc556edf1 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -1033,6 +1033,11 @@ void WebContentsImpl::NotifyNavigationStateChanged(unsigned changed_flags) {
delegate_->NavigationStateChanged(this, changed_flags);
}
+void WebContentsImpl::NotifyVisibleSSLStateChanged() {
+ FOR_EACH_OBSERVER(WebContentsObserver, observers_,
+ DidChangeVisibleSSLState());
+}
+
base::TimeTicks WebContentsImpl::GetLastSelectedTime() const {
return last_selected_time_;
}
@@ -2139,7 +2144,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(
@@ -2151,7 +2156,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) {

Powered by Google App Engine
This is Rietveld 408576698