summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/app/generated_resources.grd10
-rw-r--r--chrome/browser/cocoa/page_info_bubble_controller_unittest.mm5
-rw-r--r--chrome/browser/page_info_model.cc12
-rw-r--r--chrome/browser/page_info_model.h5
-rw-r--r--chrome/browser/views/page_info_bubble_view.cc2
5 files changed, 5 insertions, 29 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 8fee9ab..9fa2a82 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -5975,9 +5975,6 @@ Keep your key file in a safe place. You will need it to create new versions of y
<message name="IDS_PAGEINFO_CLOSE_BUTTON" desc="Text of button in the page info that closes the window.">
Close
</message>
- <message name="IDS_PAGE_INFO_SECURITY_TAB_IDENTITY_TITLE" desc="The name of the identity section.">
- Identity
- </message>
<message name="IDS_PAGE_INFO_SECURITY_TAB_SECURE_IDENTITY" desc="The text of the identity section when the page is secure.">
The identity of this website has been verified by <ph name="ISSUER">$1<ex>VeriSign</ex></ph>.
</message>
@@ -6014,9 +6011,6 @@ Keep your key file in a safe place. You will need it to create new versions of y
The certificate does not specify a mechanism to check whether it has been revoked.
</message>
- <message name="IDS_PAGE_INFO_SECURITY_TAB_CONNECTION_TITLE" desc="The name of the connection section.">
- Connection
- </message>
<message name="IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTED_CONNECTION_TEXT" desc="The text of the connection section when the connection is encrypted.">
Your connection to <ph name="DOMAIN">$1<ex>www.google.com</ex></ph> is encrypted with <ph name="BIT_COUNT">$2<ex>128</ex></ph>-bit encryption.
</message>
@@ -7429,10 +7423,6 @@ Keep your key file in a safe place. You will need it to create new versions of y
Script on the page used too much memory. Reload to enable scripts again.
</message>
- <message name="IDS_PAGE_INFO_SECURITY_TAB_PERSONAL_HISTORY_TITLE"
- desc="Title of the personal history section">
- Visit history
- </message>
<message name="IDS_PAGE_INFO_SECURITY_TAB_FIRST_VISITED_TODAY"
desc="Message in IDS_PAGE_INFO_SECURITY_TAB_PERSONAL_HISTORY_TITLE section displayed when first visited page today">
You have never visited this site before today.
diff --git a/chrome/browser/cocoa/page_info_bubble_controller_unittest.mm b/chrome/browser/cocoa/page_info_bubble_controller_unittest.mm
index da8a9db..3354577 100644
--- a/chrome/browser/cocoa/page_info_bubble_controller_unittest.mm
+++ b/chrome/browser/cocoa/page_info_bubble_controller_unittest.mm
@@ -26,7 +26,7 @@ class FakeModel : public PageInfoModel {
const string16& description,
SectionInfoType type) {
sections_.push_back(SectionInfo(
- icon_id, string16(), headline, description, type));
+ icon_id, headline, description, type));
}
};
@@ -151,8 +151,7 @@ TEST_F(PageInfoBubbleControllerTest, HistoryNoSecurity) {
CreateBubble();
model_->AddSection(PageInfoModel::ICON_STATE_ERROR,
- l10n_util::GetStringUTF16(
- IDS_PAGE_INFO_SECURITY_TAB_PERSONAL_HISTORY_TITLE),
+ l10n_util::GetStringUTF16(IDS_PAGE_INFO_SITE_INFO_TITLE),
l10n_util::GetStringUTF16(
IDS_PAGE_INFO_SECURITY_TAB_FIRST_VISITED_TODAY),
PageInfoModel::SECTION_INFO_FIRST_VISIT);
diff --git a/chrome/browser/page_info_model.cc b/chrome/browser/page_info_model.cc
index 02b1fbc..8b0d983 100644
--- a/chrome/browser/page_info_model.cc
+++ b/chrome/browser/page_info_model.cc
@@ -150,7 +150,6 @@ PageInfoModel::PageInfoModel(Profile* profile,
}
sections_.push_back(SectionInfo(
icon_id,
- l10n_util::GetStringUTF16(IDS_PAGE_INFO_SECURITY_TAB_IDENTITY_TITLE),
headline,
description,
SECTION_INFO_IDENTITY));
@@ -240,7 +239,6 @@ PageInfoModel::PageInfoModel(Profile* profile,
if (!description.empty()) {
sections_.push_back(SectionInfo(
icon_id,
- l10n_util::GetStringUTF16(IDS_PAGE_INFO_SECURITY_TAB_CONNECTION_TITLE),
headline,
description,
SECTION_INFO_CONNECTION));
@@ -299,23 +297,19 @@ void PageInfoModel::OnGotVisitCountToHost(HistoryService::Handle handle,
visited_before_today = (first_visit_midnight < today);
}
- string16 title = l10n_util::GetStringUTF16(IDS_PAGE_INFO_SITE_INFO_TITLE);
+ string16 headline = l10n_util::GetStringUTF16(IDS_PAGE_INFO_SITE_INFO_TITLE);
if (!visited_before_today) {
sections_.push_back(SectionInfo(
ICON_STATE_WARNING_MAJOR,
- l10n_util::GetStringUTF16(
- IDS_PAGE_INFO_SECURITY_TAB_PERSONAL_HISTORY_TITLE),
- title,
+ headline,
l10n_util::GetStringUTF16(
IDS_PAGE_INFO_SECURITY_TAB_FIRST_VISITED_TODAY),
SECTION_INFO_FIRST_VISIT));
} else {
sections_.push_back(SectionInfo(
ICON_STATE_INFO,
- l10n_util::GetStringUTF16(
- IDS_PAGE_INFO_SECURITY_TAB_PERSONAL_HISTORY_TITLE),
- title,
+ headline,
l10n_util::GetStringFUTF16(
IDS_PAGE_INFO_SECURITY_TAB_VISITED_BEFORE_TODAY,
WideToUTF16(base::TimeFormatShortDate(first_visit))),
diff --git a/chrome/browser/page_info_model.h b/chrome/browser/page_info_model.h
index 3e6b962..c89aaca 100644
--- a/chrome/browser/page_info_model.h
+++ b/chrome/browser/page_info_model.h
@@ -52,12 +52,10 @@ class PageInfoModel {
struct SectionInfo {
SectionInfo(SectionStateIcon icon_id,
- const string16& title,
const string16& headline,
const string16& description,
SectionInfoType type)
: icon_id(icon_id),
- title(title),
headline(headline),
description(description),
type(type) {
@@ -66,9 +64,6 @@ class PageInfoModel {
// The overall state of the connection (error, warning, ok).
SectionStateIcon icon_id;
- // The title of the section.
- string16 title;
-
// A single line describing the section, optional.
string16 headline;
diff --git a/chrome/browser/views/page_info_bubble_view.cc b/chrome/browser/views/page_info_bubble_view.cc
index 0aa1d71..90fa667 100644
--- a/chrome/browser/views/page_info_bubble_view.cc
+++ b/chrome/browser/views/page_info_bubble_view.cc
@@ -140,8 +140,6 @@ void PageInfoBubbleView::LayoutSections() {
for (int i = 0; i < count; ++i) {
PageInfoModel::SectionInfo info = model_.GetSectionInfo(i);
layout->StartRow(0, 0);
- // TODO(finnur): Remove title from the info struct, since it is
- // not used anymore.
const SkBitmap* icon = model_.GetIconImage(info.icon_id);
layout->AddView(new Section(this, info, icon, cert_id_ > 0));
generated by cgit v1.1 at 2025-01-08 10:28:06 +0000