Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(501)

Unified Diff: build/ios/grit_whitelist.txt

Issue 23727002: Add --disable-pnacl to about://flags (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/app/generated_resources.grd » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/ios/grit_whitelist.txt
diff --git a/build/ios/grit_whitelist.txt b/build/ios/grit_whitelist.txt
index ed15d463a1b9f5444a74f347e751c8b4b17cb2d6..2abb5b36494f6406f23a3485edf400d35e9aee77 100644
--- a/build/ios/grit_whitelist.txt
+++ b/build/ios/grit_whitelist.txt
@@ -484,6 +484,8 @@ IDS_FLAGS_DISABLE_NATIVE_AUTOFILL_UI_DESCRIPTION
IDS_FLAGS_DISABLE_NATIVE_AUTOFILL_UI_NAME
IDS_FLAGS_DISABLE_OVERSCROLL_HISTORY_NAVIGATION_DESCRIPTION
IDS_FLAGS_DISABLE_OVERSCROLL_HISTORY_NAVIGATION_NAME
+IDS_FLAGS_DISABLE_PNACL_DESCRIPTION
+IDS_FLAGS_DISABLE_PNACL_NAME
IDS_FLAGS_DISABLE_RESTORE_SESSION_STATE_DESCRIPTION
IDS_FLAGS_DISABLE_RESTORE_SESSION_STATE_NAME
IDS_FLAGS_DISABLE_SOFTWARE_RASTERIZER_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 »

Powered by Google App Engine
This is Rietveld 408576698