| Index: build/ios/grit_whitelist.txt
|
| diff --git a/build/ios/grit_whitelist.txt b/build/ios/grit_whitelist.txt
|
| index f178d8d0c8b663f5b777764ee4f44219daac2cc2..0a1d3159a47a4abb9ddd04fb5f8cfd9f69ca4567 100644
|
| --- a/build/ios/grit_whitelist.txt
|
| +++ b/build/ios/grit_whitelist.txt
|
| @@ -475,6 +475,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
|
| @@ -552,8 +554,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
|
|
|