From 799df8c0f37b3efe1c76988237dbb6659292c170 Mon Sep 17 00:00:00 2001 From: "rsleevi@chromium.org" Date: Fri, 11 Jul 2014 23:34:57 +0000 Subject: [PATCH] Revert 282726 "Reland "Use upstream libaddressinput in Chrome."" Reverted for merge conflict > Reland "Use upstream libaddressinput in Chrome." > > Remove static initializer and reland https://crrev.com/282408 which was > reverted in https://crrev.com/282426. > > TBR=estade@chromium.org,thestig@chromium.org > BUG=389918 > > Review URL: https://codereview.chromium.org/386873002 TBR=rouslan@chromium.org Review URL: https://codereview.chromium.org/387123004 git-svn-id: http://src.chromium.org/svn/trunk/src/build@282732 4ff67af0-8c30-449e-8e8b-ad334ec8d88c --- ios/grit_whitelist.txt | 35 ----------------------------------- 1 file changed, 35 deletions(-) diff --git a/ios/grit_whitelist.txt b/ios/grit_whitelist.txt index c55ad9afc..8c5252c71 100644 --- a/ios/grit_whitelist.txt +++ b/ios/grit_whitelist.txt @@ -591,41 +591,6 @@ IDS_IMPORT_FROM_FIREFOX IDS_IMPORT_FROM_ICEWEASEL IDS_KEYWORD_SEARCH IDS_LEARN_MORE -IDS_LIBADDRESSINPUT_ADDRESS_LINE_1_LABEL -IDS_LIBADDRESSINPUT_AREA -IDS_LIBADDRESSINPUT_COUNTRY_OR_REGION_LABEL -IDS_LIBADDRESSINPUT_COUNTY -IDS_LIBADDRESSINPUT_DEPARTMENT -IDS_LIBADDRESSINPUT_DISTRICT -IDS_LIBADDRESSINPUT_DO_SI -IDS_LIBADDRESSINPUT_EMIRATE -IDS_LIBADDRESSINPUT_ISLAND -IDS_LIBADDRESSINPUT_LOCALITY_LABEL -IDS_LIBADDRESSINPUT_MISMATCHING_VALUE_POSTAL_CODE -IDS_LIBADDRESSINPUT_MISMATCHING_VALUE_POSTAL_CODE_URL -IDS_LIBADDRESSINPUT_MISMATCHING_VALUE_ZIP -IDS_LIBADDRESSINPUT_MISMATCHING_VALUE_ZIP_URL -IDS_LIBADDRESSINPUT_MISSING_REQUIRED_FIELD -IDS_LIBADDRESSINPUT_MISSING_REQUIRED_POSTAL_CODE_EXAMPLE -IDS_LIBADDRESSINPUT_MISSING_REQUIRED_POSTAL_CODE_EXAMPLE_AND_URL -IDS_LIBADDRESSINPUT_MISSING_REQUIRED_ZIP_CODE_EXAMPLE -IDS_LIBADDRESSINPUT_MISSING_REQUIRED_ZIP_CODE_EXAMPLE_AND_URL -IDS_LIBADDRESSINPUT_OBLAST -IDS_LIBADDRESSINPUT_PARISH -IDS_LIBADDRESSINPUT_POSTAL_CODE_LABEL -IDS_LIBADDRESSINPUT_PO_BOX_FORBIDDEN_VALUE -IDS_LIBADDRESSINPUT_PREFECTURE -IDS_LIBADDRESSINPUT_PROVINCE -IDS_LIBADDRESSINPUT_RECIPIENT_LABEL -IDS_LIBADDRESSINPUT_STATE -IDS_LIBADDRESSINPUT_UNKNOWN_VALUE -IDS_LIBADDRESSINPUT_UNRECOGNIZED_FORMAT_POSTAL_CODE -IDS_LIBADDRESSINPUT_UNRECOGNIZED_FORMAT_POSTAL_CODE_EXAMPLE -IDS_LIBADDRESSINPUT_UNRECOGNIZED_FORMAT_POSTAL_CODE_EXAMPLE_AND_URL -IDS_LIBADDRESSINPUT_UNRECOGNIZED_FORMAT_ZIP -IDS_LIBADDRESSINPUT_UNRECOGNIZED_FORMAT_ZIP_CODE_EXAMPLE -IDS_LIBADDRESSINPUT_UNRECOGNIZED_FORMAT_ZIP_CODE_EXAMPLE_AND_URL -IDS_LIBADDRESSINPUT_ZIP_CODE_LABEL IDS_LOGIN_DIALOG_OK_BUTTON_LABEL IDS_LOGIN_DIALOG_PASSWORD_FIELD IDS_LOGIN_DIALOG_TITLE