build/ios/grit_whitelist.txt - Issue 1002283005: Add an error page for net::ERR_ICANN_NAME_COLLISION.

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: build/ios/grit_whitelist.txt

Issue 1002283005: Add an error page for net::ERR_ICANN_NAME_COLLISION. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@dns_53

Patch Set: rebase (dependent change now landed) 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « android_webview/java/src/org/chromium/android_webview/ErrorCodeConversionHelper.java ('k') | chrome/app/generated_resources.grd » ('j') | chrome/app/generated_resources.grd » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: build/ios/grit_whitelist.txt

diff --git a/build/ios/grit_whitelist.txt b/build/ios/grit_whitelist.txt

index 28407eb3087a114639809973f0884fb431ac461e..169677164f3b01a685c9de563514ae6d420d7606 100644

--- a/build/ios/grit_whitelist.txt

+++ b/build/ios/grit_whitelist.txt

@@ -348,6 +348,7 @@ IDS_ERRORPAGES_DETAILS_FORBIDDEN

IDS_ERRORPAGES_DETAILS_GATEWAY_TIMEOUT

IDS_ERRORPAGES_DETAILS_GONE

IDS_ERRORPAGES_DETAILS_HTTP_VERSION_NOT_SUPPORTED

+IDS_ERRORPAGES_DETAILS_ICANN_NAME_COLLISION

IDS_ERRORPAGES_DETAILS_INTERNAL_SERVER_ERROR

IDS_ERRORPAGES_DETAILS_INTERNET_DISCONNECTED

IDS_ERRORPAGES_DETAILS_NAME_NOT_RESOLVED

@@ -426,6 +427,7 @@ IDS_ERRORPAGES_SUMMARY_FILE_ACCESS_DENIED

IDS_ERRORPAGES_SUMMARY_FORBIDDEN

IDS_ERRORPAGES_SUMMARY_GATEWAY_TIMEOUT

IDS_ERRORPAGES_SUMMARY_GONE

+IDS_ERRORPAGES_SUMMARY_ICANN_NAME_COLLISION

IDS_ERRORPAGES_SUMMARY_INTERNAL_SERVER_ERROR

IDS_ERRORPAGES_SUMMARY_INTERNET_DISCONNECTED

IDS_ERRORPAGES_SUMMARY_INTERNET_DISCONNECTED_INSTRUCTIONS_TEMPLATE