chrome/common/localized_error.cc - Issue 1341923002: Create a component for SSL error handling

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/common/localized_error.cc

Issue 1341923002: Create a component for SSL error handling (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Update iOS grit whitelist Created 5 years, 3 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:

Index: chrome/common/localized_error.cc

diff --git a/chrome/common/localized_error.cc b/chrome/common/localized_error.cc

index d04dc4be17e46d8e03e418612538a80998ad2aaf..e9e6b6511af02254573fcd04b0ba0b2b3941d0a2 100644

--- a/chrome/common/localized_error.cc

+++ b/chrome/common/localized_error.cc

@@ -21,6 +21,7 @@

#include "components/url_formatter/url_formatter.h"

#include "grit/components_chromium_strings.h"

#include "grit/components_google_chrome_strings.h"

+#include "grit/components_strings.h"

#include "net/base/escape.h"

#include "net/base/net_errors.h"

#include "third_party/WebKit/public/platform/WebURLError.h"

@@ -268,8 +269,8 @@ const LocalizedErrorMap net_error_options[] = {

{net::ERR_SSL_PINNED_KEY_NOT_IN_CERT_CHAIN,

IDS_ERRORPAGES_TITLE_LOAD_FAILED,

IDS_ERRORPAGES_HEADING_PINNING_FAILURE,

- IDS_ERRORPAGES_SUMMARY_PINNING_FAILURE,

- IDS_ERRORPAGES_DETAILS_PINNING_FAILURE,

+ IDS_CERT_ERROR_SUMMARY_PINNING_FAILURE_DETAILS,

+ IDS_CERT_ERROR_SUMMARY_PINNING_FAILURE_DESCRIPTION,

SUGGEST_NONE,

{net::ERR_TEMPORARILY_THROTTLED,

« no previous file with comments | « chrome/chrome_browser.gypi ('k') | components/BUILD.gn » ('j') | no next file with comments »