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/toolbar_model.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/toolbar_model.cc')
| -rw-r--r-- | chrome/browser/toolbar_model.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/chrome/browser/toolbar_model.cc b/chrome/browser/toolbar_model.cc index 59689c2..9f83ed2 100644 --- a/chrome/browser/toolbar_model.cc +++ b/chrome/browser/toolbar_model.cc @@ -39,7 +39,7 @@ std::wstring ToolbarModel::GetText() { // Explicitly hide the URL for this tab. url = GURL(); } else if (entry) { - url = entry->GetDisplayURL(); + url = entry->display_url(); } } return gfx::ElideUrl(url, ChromeFont(), 0, languages); @@ -133,10 +133,9 @@ void ToolbarModel::GetIconHoverText(std::wstring* text, SkColor* text_color) { text->assign(error_info.short_description()); *text_color = kBrokenHttpsInfoBubbleTextColor; } else { - const GURL& url = entry->GetURL(); - DCHECK(url.has_host()); + DCHECK(entry->url().has_host()); text->assign(l10n_util::GetStringF(IDS_SECURE_CONNECTION, - UTF8ToWide(url.host()))); + UTF8ToWide(entry->url().host()))); *text_color = kOKHttpsInfoBubbleTextColor; } break; @@ -196,7 +195,7 @@ void ToolbarModel::CreateErrorText(NavigationEntry* entry, std::wstring* text) { std::vector<SSLErrorInfo> errors; SSLErrorInfo::GetErrorsForCertStatus(ssl.cert_id(), ssl.cert_status(), - entry->GetURL(), + entry->url(), &errors); if (ssl.has_mixed_content()) { errors.push_back(SSLErrorInfo::CreateError(SSLErrorInfo::MIXED_CONTENTS, |