| 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
|
|
|