diff options
author | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-27 18:09:07 +0000 |
---|---|---|
committer | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-27 18:09:07 +0000 |
commit | 1e5645ff803bf73889ced446dab5b5f81e6023c0 (patch) | |
tree | 560899029aee3d7b933ae5baf1e17f89d90696a1 /chrome/browser/ssl_blocking_page.cc | |
parent | 473343c408b846fda90eba9bd7cf96a342f6f286 (diff) | |
download | chromium_src-1e5645ff803bf73889ced446dab5b5f81e6023c0.zip chromium_src-1e5645ff803bf73889ced446dab5b5f81e6023c0.tar.gz chromium_src-1e5645ff803bf73889ced446dab5b5f81e6023c0.tar.bz2 |
Cleanup navigation_entry.h. I made the accessors consistent and in Google style, and organized and commented all the entries. Hopefully it will be much easier to find things and deal with this class.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1449 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ssl_blocking_page.cc')
-rw-r--r-- | chrome/browser/ssl_blocking_page.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/chrome/browser/ssl_blocking_page.cc b/chrome/browser/ssl_blocking_page.cc index 2971753..db0f684 100644 --- a/chrome/browser/ssl_blocking_page.cc +++ b/chrome/browser/ssl_blocking_page.cc @@ -140,20 +140,19 @@ void SSLBlockingPage::Show() { // interstitial is going away, it will not conflict with any future // navigations. created_nav_entry_ = true; - nav_entry->SetPageID(tab_->GetMaxPageID() + 1); - nav_entry->SetURL(error_->request_url()); + nav_entry->set_page_id(tab_->GetMaxPageID() + 1); + nav_entry->set_url(error_->request_url()); } else { // Make sure to update the current entry ssl state to reflect the error. *nav_entry = *(tab_->controller()->GetPendingEntry()); } - nav_entry->SetPageType(NavigationEntry::INTERSTITIAL_PAGE); + nav_entry->set_page_type(NavigationEntry::INTERSTITIAL_PAGE); nav_entry->ssl().set_security_style(SECURITY_STYLE_AUTHENTICATION_BROKEN); nav_entry->ssl().set_cert_id(cert_id); nav_entry->ssl().set_cert_status(ssl_info.cert_status); nav_entry->ssl().set_security_bits(ssl_info.security_bits); // The controller will own the entry. - int page_id = nav_entry->GetPageID(); tab_->controller()->DidNavigateToEntry(nav_entry); tab->ShowInterstitialPage(html_text, NULL); } @@ -223,7 +222,7 @@ void SSLBlockingPage::DontProceed() { // interstitial to hide which will trigger "this" to be deleted. tab_->controller()->LoadURL(GURL("about:blank"), PageTransition::AUTO_BOOKMARK); - } else if (entry->GetType() != TAB_CONTENTS_WEB) { + } else if (entry->tab_type() != TAB_CONTENTS_WEB) { // Not a WebContent, reload it so to recreate the TabContents for it. tab_->controller()->Reload(); } else { |