diff options
author | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-04 21:53:47 +0000 |
---|---|---|
committer | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-04 21:53:47 +0000 |
commit | 5343ab8e6cac9890de6de8f69711790a144cbc9b (patch) | |
tree | 9538fc6c4c06a927eed9b1502878d3e7ab27e4c0 | |
parent | 68873ba1947a0c0af5906817f914893bee769090 (diff) | |
download | chromium_src-5343ab8e6cac9890de6de8f69711790a144cbc9b.zip chromium_src-5343ab8e6cac9890de6de8f69711790a144cbc9b.tar.gz chromium_src-5343ab8e6cac9890de6de8f69711790a144cbc9b.tar.bz2 |
Remove the obsolete TabContents::GetSecurityStyle and
TabContents::GetSSLEVText methods.
This is discovered by Fumitoshi Ukai.
R=jcampan
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/118145
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17674 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | chrome/browser/tab_contents/tab_contents.cc | 30 | ||||
-rw-r--r-- | chrome/browser/tab_contents/tab_contents.h | 9 |
2 files changed, 0 insertions, 39 deletions
diff --git a/chrome/browser/tab_contents/tab_contents.cc b/chrome/browser/tab_contents/tab_contents.cc index 5fed05f..dcbfcef 100644 --- a/chrome/browser/tab_contents/tab_contents.cc +++ b/chrome/browser/tab_contents/tab_contents.cc @@ -523,36 +523,6 @@ bool TabContents::ShouldDisplayFavIcon() { return true; } -#if defined(OS_WIN) -SecurityStyle TabContents::GetSecurityStyle() const { - // We may not have a navigation entry yet. - NavigationEntry* entry = controller_.GetActiveEntry(); - return entry ? entry->ssl().security_style() : SECURITY_STYLE_UNKNOWN; -} - -bool TabContents::GetSSLEVText(std::wstring* ev_text, - std::wstring* ev_tooltip_text) const { - DCHECK(ev_text && ev_tooltip_text); - ev_text->clear(); - ev_tooltip_text->clear(); - - NavigationEntry* entry = controller_.GetActiveEntry(); - if (!entry || - net::IsCertStatusError(entry->ssl().cert_status()) || - ((entry->ssl().cert_status() & net::CERT_STATUS_IS_EV) == 0)) - return false; - - scoped_refptr<net::X509Certificate> cert; - CertStore::GetSharedInstance()->RetrieveCert(entry->ssl().cert_id(), &cert); - if (!cert.get()) { - NOTREACHED(); - return false; - } - - return SSLManager::GetEVCertNames(*cert, ev_text, ev_tooltip_text); -} -#endif - std::wstring TabContents::GetStatusText() const { if (!is_loading() || load_state_ == net::LOAD_STATE_IDLE) return std::wstring(); diff --git a/chrome/browser/tab_contents/tab_contents.h b/chrome/browser/tab_contents/tab_contents.h index 2853ceb..dedcca5 100644 --- a/chrome/browser/tab_contents/tab_contents.h +++ b/chrome/browser/tab_contents/tab_contents.h @@ -207,15 +207,6 @@ class TabContents : public PageNavigator, // space is provided for the favicon, and the favicon is never displayed. virtual bool ShouldDisplayFavIcon(); - // SSL related states. - SecurityStyle GetSecurityStyle() const; - - // Sets |ev_text| to the text that should be displayed in the EV label of - // the location bar and |ev_tooltip_text| to the tooltip for that label. - // Returns false and sets these strings to empty if the current page is either - // not served over HTTPS or if HTTPS does not use an EV cert. - bool GetSSLEVText(std::wstring* ev_text, std::wstring* ev_tooltip_text) const; - // Returns a human-readable description the tab's loading state. virtual std::wstring GetStatusText() const; |