diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-21 00:15:04 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-21 00:15:04 +0000 |
| commit | cfa79d76cd3ee095580ba05b8f872d91ae498313 (patch) | |
| tree | 3a2f33569cb1b5789698dd566d58b1d7b0f3ba52 /chrome/browser/page_info_model.cc | |
| parent | af1a532a2964fe7d9b14d07dbd4fbb3f52e246da (diff) | |
| download | chromium_src-cfa79d76cd3ee095580ba05b8f872d91ae498313.zip chromium_src-cfa79d76cd3ee095580ba05b8f872d91ae498313.tar.gz chromium_src-cfa79d76cd3ee095580ba05b8f872d91ae498313.tar.bz2 | |
Move SecurityStyle enum into content/public/common and put it into the content namespace.BUG=98716
Review URL: http://codereview.chromium.org/8361019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106642 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/page_info_model.cc')
| -rw-r--r-- | chrome/browser/page_info_model.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/page_info_model.cc b/chrome/browser/page_info_model.cc index d979a22..1054449 100644 --- a/chrome/browser/page_info_model.cc +++ b/chrome/browser/page_info_model.cc @@ -140,7 +140,7 @@ PageInfoModel::PageInfoModel(Profile* profile, // HTTP or HTTPS with errors (not warnings). description.assign(l10n_util::GetStringUTF16( IDS_PAGE_INFO_SECURITY_TAB_INSECURE_IDENTITY)); - icon_id = ssl.security_style() == SECURITY_STYLE_UNAUTHENTICATED ? + icon_id = ssl.security_style() == content::SECURITY_STYLE_UNAUTHENTICATED ? ICON_STATE_WARNING_MAJOR : ICON_STATE_ERROR; const string16 bullet = UTF8ToUTF16("\n • "); @@ -173,8 +173,8 @@ PageInfoModel::PageInfoModel(Profile* profile, description.clear(); if (!ssl.cert_id()) { // Not HTTPS. - DCHECK_EQ(ssl.security_style(), SECURITY_STYLE_UNAUTHENTICATED); - icon_id = ssl.security_style() == SECURITY_STYLE_UNAUTHENTICATED ? + DCHECK_EQ(ssl.security_style(), content::SECURITY_STYLE_UNAUTHENTICATED); + icon_id = ssl.security_style() == content::SECURITY_STYLE_UNAUTHENTICATED ? ICON_STATE_WARNING_MAJOR : ICON_STATE_ERROR; description.assign(l10n_util::GetStringFUTF16( IDS_PAGE_INFO_SECURITY_TAB_NOT_ENCRYPTED_CONNECTION_TEXT, @@ -183,7 +183,7 @@ PageInfoModel::PageInfoModel(Profile* profile, // Security strength is unknown. Say nothing. icon_id = ICON_STATE_ERROR; } else if (ssl.security_bits() == 0) { - DCHECK_NE(ssl.security_style(), SECURITY_STYLE_UNAUTHENTICATED); + DCHECK_NE(ssl.security_style(), content::SECURITY_STYLE_UNAUTHENTICATED); icon_id = ICON_STATE_ERROR; description.assign(l10n_util::GetStringFUTF16( IDS_PAGE_INFO_SECURITY_TAB_NOT_ENCRYPTED_CONNECTION_TEXT, |