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

Unified Diff: content/browser/ssl/ssl_manager.cc

Issue 949473002: Avoid unnecessary casts in NavigationControllerImpl. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 10 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/ssl/ssl_manager.cc
diff --git a/content/browser/ssl/ssl_manager.cc b/content/browser/ssl/ssl_manager.cc
index ccaf9cf2062bd2660d6ea0ac4b2c43b21b2daa89..865ca6027a2e631637056b803fff0a9b7f724c20 100644
--- a/content/browser/ssl/ssl_manager.cc
+++ b/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);
}
« no previous file with comments | « content/browser/frame_host/navigator_impl.cc ('k') | content/browser/web_contents/aura/overscroll_navigation_overlay.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698