Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(54)

Side by Side Diff: chrome/browser/ui/website_settings/website_settings_ui.cc

Issue 1020953003: Change the OIB security summary phrase to reflect SHA-1 deprecation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/website_settings/website_settings_ui.h" 5 #include "chrome/browser/ui/website_settings/website_settings_ui.h"
6 6
7 #include "chrome/grit/chromium_strings.h" 7 #include "chrome/grit/chromium_strings.h"
8 #include "chrome/grit/generated_resources.h" 8 #include "chrome/grit/generated_resources.h"
9 #include "grit/theme_resources.h" 9 #include "grit/theme_resources.h"
10 #include "ui/base/l10n/l10n_util.h" 10 #include "ui/base/l10n/l10n_util.h"
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 connection_status(WebsiteSettings::SITE_CONNECTION_STATUS_UNKNOWN), 87 connection_status(WebsiteSettings::SITE_CONNECTION_STATUS_UNKNOWN),
88 show_ssl_decision_revoke_button(false) { 88 show_ssl_decision_revoke_button(false) {
89 } 89 }
90 90
91 WebsiteSettingsUI::IdentityInfo::~IdentityInfo() {} 91 WebsiteSettingsUI::IdentityInfo::~IdentityInfo() {}
92 92
93 base::string16 WebsiteSettingsUI::IdentityInfo::GetIdentityStatusText() const { 93 base::string16 WebsiteSettingsUI::IdentityInfo::GetIdentityStatusText() const {
94 switch (identity_status) { 94 switch (identity_status) {
95 case WebsiteSettings::SITE_IDENTITY_STATUS_CERT: 95 case WebsiteSettings::SITE_IDENTITY_STATUS_CERT:
96 case WebsiteSettings::SITE_IDENTITY_STATUS_EV_CERT: 96 case WebsiteSettings::SITE_IDENTITY_STATUS_EV_CERT:
97 case WebsiteSettings::SITE_IDENTITY_STATUS_DEPRECATED_SIGNATURE_ALGORITHM:
98 case WebsiteSettings::SITE_IDENTITY_STATUS_CERT_REVOCATION_UNKNOWN: 97 case WebsiteSettings::SITE_IDENTITY_STATUS_CERT_REVOCATION_UNKNOWN:
99 return l10n_util::GetStringUTF16(IDS_WEBSITE_SETTINGS_SECURE_TRANSPORT); 98 return l10n_util::GetStringUTF16(IDS_WEBSITE_SETTINGS_SECURE_TRANSPORT);
99 case WebsiteSettings::SITE_IDENTITY_STATUS_DEPRECATED_SIGNATURE_ALGORITHM:
100 return l10n_util::GetStringUTF16(
101 IDS_WEBSITE_DEPRECATED_SIGNATURE_ALGORITHM);
100 case WebsiteSettings::SITE_IDENTITY_STATUS_ADMIN_PROVIDED_CERT: 102 case WebsiteSettings::SITE_IDENTITY_STATUS_ADMIN_PROVIDED_CERT:
101 return l10n_util::GetStringUTF16(IDS_CERT_POLICY_PROVIDED_CERT_HEADER); 103 return l10n_util::GetStringUTF16(IDS_CERT_POLICY_PROVIDED_CERT_HEADER);
102 case WebsiteSettings::SITE_IDENTITY_STATUS_UNKNOWN: 104 case WebsiteSettings::SITE_IDENTITY_STATUS_UNKNOWN:
103 return l10n_util::GetStringUTF16(IDS_WEBSITE_SETTINGS_UNKNOWN_TRANSPORT); 105 return l10n_util::GetStringUTF16(IDS_WEBSITE_SETTINGS_UNKNOWN_TRANSPORT);
104 case WebsiteSettings::SITE_IDENTITY_STATUS_INTERNAL_PAGE: 106 case WebsiteSettings::SITE_IDENTITY_STATUS_INTERNAL_PAGE:
105 return l10n_util::GetStringUTF16(IDS_WEBSITE_SETTINGS_INTERNAL_PAGE); 107 return l10n_util::GetStringUTF16(IDS_WEBSITE_SETTINGS_INTERNAL_PAGE);
106 case WebsiteSettings::SITE_IDENTITY_STATUS_NO_CERT: 108 case WebsiteSettings::SITE_IDENTITY_STATUS_NO_CERT:
107 default: 109 default:
108 return l10n_util::GetStringUTF16( 110 return l10n_util::GetStringUTF16(
109 IDS_WEBSITE_SETTINGS_NON_SECURE_TRANSPORT); 111 IDS_WEBSITE_SETTINGS_NON_SECURE_TRANSPORT);
(...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after
357 // the first time. 359 // the first time.
358 return IDR_PAGEINFO_INFO; 360 return IDR_PAGEINFO_INFO;
359 } 361 }
360 362
361 // static 363 // static
362 const gfx::Image& WebsiteSettingsUI::GetFirstVisitIcon( 364 const gfx::Image& WebsiteSettingsUI::GetFirstVisitIcon(
363 const base::string16& first_visit) { 365 const base::string16& first_visit) {
364 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); 366 ResourceBundle& rb = ResourceBundle::GetSharedInstance();
365 return rb.GetNativeImageNamed(GetFirstVisitIconID(first_visit)); 367 return rb.GetNativeImageNamed(GetFirstVisitIconID(first_visit));
366 } 368 }
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698