chrome/browser/ui/views/website_settings/website_settings_popup_view.cc - Issue 13483010: Add UI notifications for admin-provided SSL certificates.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/views/website_settings/website_settings_popup_view.cc

Issue 13483010: Add UI notifications for admin-provided SSL certificates. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: remove testing hack Created 7 years, 8 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 side-by-side diff with in-line comments

Download patch

« chrome/browser/ui/toolbar/toolbar_model_impl.cc ('K') | « chrome/browser/ui/views/location_bar/location_bar_view.cc ('k') | chrome/browser/ui/website_settings/website_settings.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/website_settings/website_settings_popup_view.cc

diff --git a/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc b/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc

index 10a15234c6d43c4aec88a405b6352eb08a6bf96d..7aa9cec8e0ceb407f6afc2725752e0062bbbd331 100644

--- a/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc

+++ b/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc

@@ -515,6 +515,10 @@ void WebsiteSettingsPopupView::SetIdentityInfo(

l10n_util::GetStringUTF16(IDS_WEBSITE_SETTINGS_IDENTITY_VERIFIED);

text_color = kIdentityVerifiedTextColor;

break;

+ case WebsiteSettings::SITE_IDENTITY_STATUS_ADMIN_PROVIDED_CERT:

+ identity_status_text =

+ l10n_util::GetStringUTF16(IDS_CERT_POLICY_PROVIDED_CERT_HEADER);

+ break;

default:

identity_status_text =

l10n_util::GetStringUTF16(IDS_WEBSITE_SETTINGS_IDENTITY_NOT_VERIFIED);