build/ios/grit_whitelist.txt - Issue 935333002: Update from https://crrev.com/316786

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 935333002: Update from https://crrev.com/316786 (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: Created 5 years, 10 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: build/ios/grit_whitelist.txt

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

index 7fc4e1d1bb037d99c73dde3c035ebda08b8d2367..c1edfdf3c4459de1e39d8f9db06f0a715bd6cac4 100644

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

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

@@ -12,6 +12,7 @@ IDR_CRASHES_HTML

IDR_CRASHES_JS

IDR_CREDITS_HTML

IDR_CREDITS_JS

+IDR_DATA_REDUCTION_PROXY_INTERSTITIAL_HTML

IDR_DEFAULT_FAVICON

IDR_DEFAULT_FAVICON_32

IDR_DEFAULT_FAVICON_64

@@ -176,6 +177,7 @@ IDS_BOOKMARK_BAR_REDO_DELETE

IDS_BOOKMARK_BAR_REDO_EDIT

IDS_BOOKMARK_BAR_REDO_MOVE

IDS_BOOKMARK_BAR_REDO_REORDER

+IDS_BOOKMARK_BAR_SUPERVISED_FOLDER_DEFAULT_NAME

IDS_BOOKMARK_BAR_UNDO

IDS_BOOKMARK_BAR_UNDO_ADD

IDS_BOOKMARK_BAR_UNDO_DELETE

@@ -270,6 +272,12 @@ IDS_CRASHES_NO_CRASHES_MESSAGE

IDS_CRASHES_TITLE

IDS_CRASHES_UPLOAD_MESSAGE

IDS_CREDIT_CARD_NUMBER_PREVIEW_FORMAT

+IDS_DATA_REDUCTION_PROXY_BACK_BUTTON

+IDS_DATA_REDUCTION_PROXY_CANNOT_PROXY_HEADING

+IDS_DATA_REDUCTION_PROXY_CANNOT_PROXY_PRIMARY_PARAGRAPH

+IDS_DATA_REDUCTION_PROXY_CANNOT_PROXY_SECONDARY_PARAGRAPH

+IDS_DATA_REDUCTION_PROXY_CONTINUE_BUTTON

+IDS_DATA_REDUCTION_PROXY_TITLE

IDS_DEFAULT_AVATAR_NAME_10

IDS_DEFAULT_AVATAR_NAME_11

IDS_DEFAULT_AVATAR_NAME_12

« no previous file with comments | « build/install-build-deps-android.sh ('k') | build/java_apk.gypi » ('j') | no next file with comments »