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

Unified Diff: build/ios/grit_whitelist.txt

Issue 19079002: Enable pnacl by default (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: IOS flag name Created 7 years, 5 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 80adea038884b735ff47b1f8067bffd823fe9b68..c692484bdb5a9612bb1e75ff71f047803fca33c8 100644
--- a/build/ios/grit_whitelist.txt
+++ b/build/ios/grit_whitelist.txt
@@ -552,8 +552,6 @@ 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
@@ -652,6 +650,8 @@ 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