diff options
Diffstat (limited to 'chromium/content/browser/ssl/ssl_manager.cc')
-rw-r--r-- | chromium/content/browser/ssl/ssl_manager.cc | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/chromium/content/browser/ssl/ssl_manager.cc b/chromium/content/browser/ssl/ssl_manager.cc index ccaf9cf2062..865ca6027a2 100644 --- a/chromium/content/browser/ssl/ssl_manager.cc +++ b/chromium/content/browser/ssl/ssl_manager.cc @@ -85,8 +85,7 @@ void SSLManager::NotifySSLInternalStateChanged(BrowserContext* context) { for (std::set<SSLManager*>::iterator i = managers->get().begin(); i != managers->get().end(); ++i) { - (*i)->UpdateEntry(NavigationEntryImpl::FromNavigationEntry( - (*i)->controller()->GetLastCommittedEntry())); + (*i)->UpdateEntry((*i)->controller()->GetLastCommittedEntry()); } } @@ -112,9 +111,7 @@ SSLManager::~SSLManager() { } void SSLManager::DidCommitProvisionalLoad(const LoadCommittedDetails& details) { - NavigationEntryImpl* entry = - NavigationEntryImpl::FromNavigationEntry( - controller_->GetLastCommittedEntry()); + NavigationEntryImpl* entry = controller_->GetLastCommittedEntry(); if (details.is_main_frame) { if (entry) { @@ -148,15 +145,11 @@ void SSLManager::DidCommitProvisionalLoad(const LoadCommittedDetails& details) { } void SSLManager::DidDisplayInsecureContent() { - UpdateEntry( - NavigationEntryImpl::FromNavigationEntry( - controller_->GetLastCommittedEntry())); + UpdateEntry(controller_->GetLastCommittedEntry()); } void SSLManager::DidRunInsecureContent(const std::string& security_origin) { - NavigationEntryImpl* navigation_entry = - NavigationEntryImpl::FromNavigationEntry( - controller_->GetLastCommittedEntry()); + NavigationEntryImpl* navigation_entry = controller_->GetLastCommittedEntry(); policy()->DidRunInsecureContent(navigation_entry, security_origin); UpdateEntry(navigation_entry); } |