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

Unified Diff: chrome/browser/tab_contents/tab_contents.cc

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/tab_contents/tab_contents.h ('k') | chrome/browser/toolbar_model.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/tab_contents/tab_contents.cc
===================================================================
--- chrome/browser/tab_contents/tab_contents.cc (revision 47323)
+++ chrome/browser/tab_contents/tab_contents.cc (working copy)
@@ -270,6 +270,7 @@
encoding_(),
blocked_popups_(NULL),
dont_notify_render_view_(false),
+ displayed_insecure_content_(false),
infobar_delegates_(),
find_ui_active_(false),
find_op_aborted_(false),
@@ -1582,6 +1583,10 @@
geolocation_settings_state_.DidNavigate(details);
if (delegate_)
delegate_->OnContentSettingsChange(this);
+
+ // Once the main frame is navigated, we're no longer considered to have
+ // displayed insecure content.
+ displayed_insecure_content_ = false;
}
// Close constrained windows if necessary.
@@ -2051,7 +2056,8 @@
}
void TabContents::DidDisplayInsecureContent() {
- controller_.ssl_manager()->DidDisplayInsecureContent();
+ displayed_insecure_content_ = true;
+ SSLManager::NotifySSLInternalStateChanged();
}
void TabContents::DidRunInsecureContent(const std::string& security_origin) {
« no previous file with comments | « chrome/browser/tab_contents/tab_contents.h ('k') | chrome/browser/toolbar_model.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698