summaryrefslogtreecommitdiffstats
path: root/chrome/browser/page_info_model.cc
diff options
context:
space:
mode:
authorfinnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-25 10:40:25 +0000
committerfinnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-25 10:40:25 +0000
commit34041bbb342fbd063e378e65482ac32647be3ca2 (patch)
treecbc7d6660d2778eaf9416d797fed427eb5c79a5a /chrome/browser/page_info_model.cc
parent2cb83c853036f789735e17b33d7bfb9805dbfa9f (diff)
downloadchromium_src-34041bbb342fbd063e378e65482ac32647be3ca2.zip
chromium_src-34041bbb342fbd063e378e65482ac32647be3ca2.tar.gz
chromium_src-34041bbb342fbd063e378e65482ac32647be3ca2.tar.bz2
Revert 57311 - Part 2 of the SSL InfoBubble.
- Added Certificate Information link. - Changed iconography to be: Identity : Green check mark vs. Red skull and bones Connection: Green padlock vs. Orange exclamation point. (This used to be Green checkmark and Orange Exclamation point for both sections. - Removed the icon for the First visit section. Need to see if we want an icon for when you haven't visited the site before. Mocks show no icons when you have visited before. BUG=52916 TEST=Open the SSL InfoBubble and notice the new iconography. Click the link and the Certificate dialog should show. Review URL: http://codereview.chromium.org/3136031 TBR=finnur@chromium.org Review URL: http://codereview.chromium.org/3170043 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57314 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/page_info_model.cc')
-rw-r--r--chrome/browser/page_info_model.cc17
1 files changed, 6 insertions, 11 deletions
diff --git a/chrome/browser/page_info_model.cc b/chrome/browser/page_info_model.cc
index 3656862..229b002 100644
--- a/chrome/browser/page_info_model.cc
+++ b/chrome/browser/page_info_model.cc
@@ -99,8 +99,7 @@ PageInfoModel::PageInfoModel(Profile* profile,
state,
l10n_util::GetStringUTF16(IDS_PAGE_INFO_SECURITY_TAB_IDENTITY_TITLE),
head_line,
- description,
- SECTION_INFO_IDENTITY));
+ description));
// Connection section.
// We consider anything less than 80 bits encryption to be weak encryption.
@@ -140,9 +139,8 @@ PageInfoModel::PageInfoModel(Profile* profile,
if (ssl.security_bits() > 0 && cipher_suite) {
bool did_fallback = (ssl.connection_status() &
net::SSL_CONNECTION_SSL3_FALLBACK) != 0;
- bool no_renegotiation =
- (ssl.connection_status() &
- net::SSL_CONNECTION_NO_RENEGOTIATION_EXTENSION) != 0;
+ bool no_renegotiation = (ssl.connection_status() &
+ net::SSL_CONNECTION_NO_RENEGOTIATION_EXTENSION) != 0;
const char *key_exchange, *cipher, *mac;
net::SSLCipherSuiteToStrings(&key_exchange, &cipher, &mac, cipher_suite);
@@ -183,8 +181,7 @@ PageInfoModel::PageInfoModel(Profile* profile,
state,
l10n_util::GetStringUTF16(IDS_PAGE_INFO_SECURITY_TAB_CONNECTION_TITLE),
head_line,
- description,
- SECTION_INFO_CONNECTION));
+ description));
// Request the number of visits.
HistoryService* history = profile->GetHistoryService(
@@ -229,8 +226,7 @@ void PageInfoModel::OnGotVisitCountToHost(HistoryService::Handle handle,
IDS_PAGE_INFO_SECURITY_TAB_PERSONAL_HISTORY_TITLE),
string16(),
l10n_util::GetStringUTF16(
- IDS_PAGE_INFO_SECURITY_TAB_FIRST_VISITED_TODAY),
- SECTION_INFO_FIRST_VISIT));
+ IDS_PAGE_INFO_SECURITY_TAB_FIRST_VISITED_TODAY)));
} else {
sections_.push_back(SectionInfo(
true,
@@ -239,8 +235,7 @@ void PageInfoModel::OnGotVisitCountToHost(HistoryService::Handle handle,
string16(),
l10n_util::GetStringFUTF16(
IDS_PAGE_INFO_SECURITY_TAB_VISITED_BEFORE_TODAY,
- WideToUTF16(base::TimeFormatShortDate(first_visit))),
- SECTION_INFO_FIRST_VISIT));
+ WideToUTF16(base::TimeFormatShortDate(first_visit)))));
}
observer_->ModelChanged();
}