| Index: build/ios/grit_whitelist.txt
|
| diff --git a/build/ios/grit_whitelist.txt b/build/ios/grit_whitelist.txt
|
| index e7673e4af62bd481d96fdf2fd391a0e1d417aa00..4703eb7190c2f075b24c3999c008af49f3b4969e 100644
|
| --- a/build/ios/grit_whitelist.txt
|
| +++ b/build/ios/grit_whitelist.txt
|
| @@ -23,8 +23,6 @@ IDR_INPUT_ALERT
|
| IDR_NET_ERROR_HTML
|
| IDR_NET_EXPORT_HTML
|
| IDR_NET_EXPORT_JS
|
| -IDR_NET_INTERNALS_HELP_HTML
|
| -IDR_NET_INTERNALS_HELP_JS
|
| IDR_OMAHA_HTML
|
| IDR_OMAHA_JS
|
| IDR_OMNIBOX_EXTENSION_APP
|
| @@ -59,7 +57,6 @@ IDR_SYNC_INTERNALS_SYNC_NODE_BROWSER_JS
|
| IDR_SYNC_INTERNALS_SYNC_SEARCH_JS
|
| IDR_THROBBER
|
| IDR_TRANSLATE_JS
|
| -IDR_UPDATE_BADGE4
|
| IDR_WEBUI_I18N_PROCESS_JS
|
| IDR_WEBUI_I18N_TEMPLATE2_JS
|
| IDR_WEBUI_I18N_TEMPLATE_JS
|
| @@ -257,8 +254,6 @@ IDS_DOM_DISTILLER_WEBUI_VIEW_URL_FAILED
|
| IDS_DONE
|
| IDS_EDIT_FIND_MAC
|
| IDS_EMPTY_KEYWORD_VALUE
|
| -IDS_ENABLE_BACKLOADER_DESCRIPTION
|
| -IDS_ENABLE_BACKLOADER_NAME
|
| IDS_ERRORPAGES_BUTTON_LESS
|
| IDS_ERRORPAGES_BUTTON_LOAD_STALE
|
| IDS_ERRORPAGES_BUTTON_LOAD_STALE_HELP
|
| @@ -445,12 +440,8 @@ IDS_FLAGS_DISABLE_WEBGL_NAME
|
| IDS_FLAGS_DISABLE_WEBRTC_DESCRIPTION
|
| IDS_FLAGS_DISABLE_WEBRTC_NAME
|
| IDS_FLAGS_ENABLE
|
| -IDS_FLAGS_ENABLE_ADVANCED_GESTURES_DESCRIPTION
|
| -IDS_FLAGS_ENABLE_ADVANCED_GESTURES_NAME
|
| IDS_FLAGS_ENABLE_APPS_DEVTOOL_APP_DESCRIPTION
|
| IDS_FLAGS_ENABLE_APPS_DEVTOOL_APP_NAME
|
| -IDS_FLAGS_ENABLE_ASH_OAK_DESCRIPTION
|
| -IDS_FLAGS_ENABLE_ASH_OAK_NAME
|
| IDS_FLAGS_ENABLE_ASYNC_DNS_DESCRIPTION
|
| IDS_FLAGS_ENABLE_ASYNC_DNS_NAME
|
| IDS_FLAGS_ENABLE_CARRIER_SWITCHING
|
| @@ -465,16 +456,10 @@ IDS_FLAGS_ENABLE_EXPERIMENTAL_CANVAS_FEATURES_DESCRIPTION
|
| IDS_FLAGS_ENABLE_EXPERIMENTAL_CANVAS_FEATURES_NAME
|
| IDS_FLAGS_ENABLE_GESTURE_TAP_HIGHLIGHTING_DESCRIPTION
|
| IDS_FLAGS_ENABLE_GESTURE_TAP_HIGHLIGHTING_NAME
|
| -IDS_FLAGS_ENABLE_GOOGLE_NOW_INTEGRATION_DESCRIPTION
|
| -IDS_FLAGS_ENABLE_GOOGLE_NOW_INTEGRATION_NAME
|
| -IDS_FLAGS_ENABLE_HTTP2_DRAFT_04_DESCRIPTION
|
| -IDS_FLAGS_ENABLE_HTTP2_DRAFT_04_NAME
|
| IDS_FLAGS_ENABLE_INTERACTIVE_AUTOCOMPLETE_DESCRIPTION
|
| IDS_FLAGS_ENABLE_INTERACTIVE_AUTOCOMPLETE_NAME
|
| IDS_FLAGS_ENABLE_JAVASCRIPT_HARMONY_DESCRIPTION
|
| IDS_FLAGS_ENABLE_JAVASCRIPT_HARMONY_NAME
|
| -IDS_FLAGS_ENABLE_MEMORY_MONITOR_DESCRIPTION
|
| -IDS_FLAGS_ENABLE_MEMORY_MONITOR_NAME
|
| IDS_FLAGS_ENABLE_NACL_DEBUG_DESCRIPTION
|
| IDS_FLAGS_ENABLE_NACL_DEBUG_NAME
|
| IDS_FLAGS_ENABLE_NACL_DESCRIPTION
|
| @@ -487,16 +472,12 @@ IDS_FLAGS_ENABLE_PINCH_SCALE_DESCRIPTION
|
| IDS_FLAGS_ENABLE_PINCH_SCALE_NAME
|
| IDS_FLAGS_ENABLE_REQUEST_TABLET_SITE_DESCRIPTION
|
| IDS_FLAGS_ENABLE_REQUEST_TABLET_SITE_NAME
|
| -IDS_FLAGS_ENABLE_RICH_NOTIFICATIONS_DESCRIPTION
|
| -IDS_FLAGS_ENABLE_RICH_NOTIFICATIONS_NAME
|
| IDS_FLAGS_ENABLE_SCREEN_CAPTURE_DESCRIPTION
|
| IDS_FLAGS_ENABLE_SCREEN_CAPTURE_NAME
|
| IDS_FLAGS_ENABLE_SIMPLE_CACHE_BACKEND_DESCRIPTION
|
| IDS_FLAGS_ENABLE_SIMPLE_CACHE_BACKEND_NAME
|
| IDS_FLAGS_ENABLE_SMOOTH_SCROLLING_DESCRIPTION
|
| IDS_FLAGS_ENABLE_SMOOTH_SCROLLING_NAME
|
| -IDS_FLAGS_ENABLE_SPDY4A2_DESCRIPTION
|
| -IDS_FLAGS_ENABLE_SPDY4A2_NAME
|
| IDS_FLAGS_ENABLE_SUGGESTIONS_SERVICE_DESCRIPTION
|
| IDS_FLAGS_ENABLE_SUGGESTIONS_SERVICE_NAME
|
| IDS_FLAGS_ENABLE_SYNCED_NOTIFICATIONS_DESCRIPTION
|
| @@ -509,8 +490,6 @@ IDS_FLAGS_ENABLE_TOUCH_DRAG_DROP_DESCRIPTION
|
| IDS_FLAGS_ENABLE_TOUCH_DRAG_DROP_NAME
|
| IDS_FLAGS_ENABLE_TOUCH_EDITING_DESCRIPTION
|
| IDS_FLAGS_ENABLE_TOUCH_EDITING_NAME
|
| -IDS_FLAGS_ENABLE_TOUCH_SIDE_BEZELS_DESCRIPTION
|
| -IDS_FLAGS_ENABLE_TOUCH_SIDE_BEZELS_NAME
|
| IDS_FLAGS_EXPERIMENTAL_EXTENSION_APIS_DESCRIPTION
|
| IDS_FLAGS_EXPERIMENTAL_EXTENSION_APIS_NAME
|
| IDS_FLAGS_EXPERIMENTAL_WEB_PLATFORM_FEATURES_DESCRIPTION
|
| @@ -521,14 +500,10 @@ IDS_FLAGS_FIXED_POSITION_CREATES_STACKING_CONTEXT_DESCRIPTION
|
| IDS_FLAGS_FIXED_POSITION_CREATES_STACKING_CONTEXT_NAME
|
| IDS_FLAGS_FORCE_ACCELERATED_OVERFLOW_SCROLL_MODE_DESCRIPTION
|
| IDS_FLAGS_FORCE_ACCELERATED_OVERFLOW_SCROLL_MODE_NAME
|
| -IDS_FLAGS_FORCE_COMPOSITING_MODE_DESCRIPTION
|
| -IDS_FLAGS_FORCE_COMPOSITING_MODE_NAME
|
| IDS_FLAGS_FORCE_HIGH_DPI_DESCRIPTION
|
| IDS_FLAGS_FORCE_HIGH_DPI_NAME
|
| IDS_FLAGS_FORCE_UNIVERSAL_ACCELERATED_OVERFLOW_SCROLL_MODE_DESCRIPTION
|
| IDS_FLAGS_FORCE_UNIVERSAL_ACCELERATED_OVERFLOW_SCROLL_MODE_NAME
|
| -IDS_FLAGS_FULL_HISTORY_SYNC_DESCRIPTION
|
| -IDS_FLAGS_FULL_HISTORY_SYNC_NAME
|
| IDS_FLAGS_IGNORE_GPU_BLACKLIST_DESCRIPTION
|
| IDS_FLAGS_IGNORE_GPU_BLACKLIST_NAME
|
| IDS_FLAGS_IMPL_SIDE_PAINTING_DESCRIPTION
|
| @@ -569,8 +544,6 @@ IDS_FLAGS_SPELLCHECK_AUTOCORRECT_DESCRIPTION
|
| IDS_FLAGS_STACKED_TAB_STRIP_DESCRIPTION
|
| IDS_FLAGS_STACKED_TAB_STRIP_NAME
|
| IDS_FLAGS_TABLE_TITLE
|
| -IDS_FLAGS_TAB_GROUPS_CONTEXT_MENU_DESCRIPTION
|
| -IDS_FLAGS_TAB_GROUPS_CONTEXT_MENU_NAME
|
| IDS_FLAGS_THREADED_COMPOSITING_MODE_DESCRIPTION
|
| IDS_FLAGS_THREADED_COMPOSITING_MODE_NAME
|
| IDS_FLAGS_TOUCH_OPTIMIZED_UI_DESCRIPTION
|
| @@ -838,10 +811,8 @@ IDS_SYNC_ACCOUNT_SYNCING_TO_USER
|
| IDS_SYNC_ACCOUNT_SYNCING_TO_USER_WITH_MANAGE_LINK
|
| IDS_SYNC_AUTHENTICATING_LABEL
|
| IDS_SYNC_BASIC_ENCRYPTION_DATA
|
| -IDS_SYNC_CANNOT_ACCESS_ACCOUNT
|
| IDS_SYNC_CLEAR_USER_DATA
|
| IDS_SYNC_CONFIGURE_ENCRYPTION
|
| -IDS_SYNC_CREATE_ACCOUNT
|
| IDS_SYNC_DATATYPE_AUTOFILL
|
| IDS_SYNC_DATATYPE_BOOKMARKS
|
| IDS_SYNC_DATATYPE_PASSWORDS
|
| @@ -858,8 +829,6 @@ IDS_SYNC_ENTER_PASSPHRASE_TITLE
|
| IDS_SYNC_ERROR_BUBBLE_VIEW_TITLE
|
| IDS_SYNC_ERROR_SIGNING_IN
|
| IDS_SYNC_FULL_ENCRYPTION_DATA
|
| -IDS_SYNC_GAIA_CAPTCHA_CASE_INSENSITIVE_TIP
|
| -IDS_SYNC_GET_ACCESS_CODE_URL
|
| IDS_SYNC_INVALID_USER_CREDENTIALS
|
| IDS_SYNC_LOGIN_INFO_OUT_OF_DATE
|
| IDS_SYNC_LOGIN_SETTING_UP
|
| @@ -897,7 +866,6 @@ IDS_SYNC_UNAVAILABLE_ERROR_BUBBLE_VIEW_ACCEPT
|
| IDS_SYNC_UNAVAILABLE_ERROR_BUBBLE_VIEW_MESSAGE
|
| IDS_SYNC_UNRECOVERABLE_ERROR_HELP_URL
|
| IDS_SYNC_UPGRADE_CLIENT
|
| -IDS_SYNC_ZERO_DATA_TYPES_ERROR
|
| IDS_SYSTEM_FLAGS_OWNER_ONLY
|
| IDS_TIME_DAYS_1ST_DEFAULT
|
| IDS_TIME_DAYS_1ST_FEW
|
|
|