build/ios/grit_whitelist.txt - Issue 22839005: disable pnacl by default

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 22839005: disable pnacl by default (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Code review changes Created 7 years, 4 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 ed15d463a1b9f5444a74f347e751c8b4b17cb2d6..c72022c6d22d2c2cb5e563f365b88af5b3d11cdf 100644

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

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

@@ -565,6 +565,8 @@ IDS_FLAGS_ENABLE_PASSWORD_GENERATION_DESCRIPTION

IDS_FLAGS_ENABLE_PASSWORD_GENERATION_NAME

IDS_FLAGS_ENABLE_PINCH_SCALE_DESCRIPTION

IDS_FLAGS_ENABLE_PINCH_SCALE_NAME

+IDS_FLAGS_ENABLE_PNACL_DESCRIPTION

+IDS_FLAGS_ENABLE_PNACL_NAME

IDS_FLAGS_ENABLE_REQUEST_TABLET_SITE_DESCRIPTION

IDS_FLAGS_ENABLE_REQUEST_TABLET_SITE_NAME

IDS_FLAGS_ENABLE_RICH_NOTIFICATIONS_DESCRIPTION

@@ -670,8 +672,6 @@ IDS_FLAGS_PERFORMANCE_MONITOR_GATHERING_DESCRIPTION

IDS_FLAGS_PERFORMANCE_MONITOR_GATHERING_NAME

IDS_FLAGS_PER_TILE_PAINTING_DESCRIPTION

IDS_FLAGS_PER_TILE_PAINTING_NAME

-IDS_FLAGS_PNACL_DESCRIPTION

-IDS_FLAGS_PNACL_NAME

IDS_FLAGS_PRESENT_WITH_GDI_ALL_SHOW

IDS_FLAGS_PRESENT_WITH_GDI_DESCRIPTION

IDS_FLAGS_PRESENT_WITH_GDI_FIRST_SHOW

« no previous file with comments | « no previous file | chrome/app/generated_resources.grd » ('j') | no next file with comments »