Separate component resources into their own .grd file

TBR=ben@chromium.org (gyp changes)
BUG=140037

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=199800

Review URL: https://chromiumcodereview.appspot.com/15018020

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@200038 0039d316-1c4b-4281-b951-d872f2087c98

15 files changed, 256 insertions, 20 deletions

diff --git a/components/autofill.gypi b/components/autofill.gypi
index daf6c83..ece3a68 100644
--- a/components/autofill.gypi
+++ b/components/autofill.gypi
@@ -123,9 +123,7 @@
             '../ui/ui.gyp:ui',
             '../webkit/support/webkit_support.gyp:webkit_resources',
 
-            # For grip/generated_resources.h and grit/chromium_strings.h
-            # TODO(kaiwang): Remove this dependency on chrome.
-            '../chrome/chrome_resources.gyp:chrome_strings',
+            'component_resources.gyp:component_resources',
           ],
           'sources': [
             'autofill/browser/address.cc',
@@ -272,9 +270,7 @@
             '../ipc/ipc.gyp:ipc',
             '../skia/skia.gyp:skia',
 
-            # For grip/generated_resources.h and grit/chromium_strings.h
-            # TODO(kaiwang): Remove this dependency on chrome.
-            '../chrome/chrome_resources.gyp:chrome_strings',
+            'component_resources.gyp:component_resources',
           ],
           'sources': [
             'autofill/renderer/autofill_agent.cc',
diff --git a/components/autofill/browser/autofill_country.cc b/components/autofill/browser/autofill_country.cc
index bae6541..ed42231 100644
--- a/components/autofill/browser/autofill_country.cc
+++ b/components/autofill/browser/autofill_country.cc
@@ -15,7 +15,7 @@
 #include "base/stl_util.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
-#include "grit/generated_resources.h"
+#include "grit/component_resources.h"
 #include "third_party/icu/public/common/unicode/locid.h"
 #include "third_party/icu/public/common/unicode/uloc.h"
 #include "third_party/icu/public/common/unicode/unistr.h"
diff --git a/components/autofill/browser/autofill_data_model.cc b/components/autofill/browser/autofill_data_model.cc
index 04cd75c..01c5455 100644
--- a/components/autofill/browser/autofill_data_model.cc
+++ b/components/autofill/browser/autofill_data_model.cc
@@ -15,7 +15,7 @@
 #include "components/autofill/browser/validation.h"
 #include "components/autofill/common/form_field_data.h"
 #include "googleurl/src/gurl.h"
-#include "grit/generated_resources.h"
+#include "grit/component_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace autofill {
diff --git a/components/autofill/browser/autofill_external_delegate.cc b/components/autofill/browser/autofill_external_delegate.cc
index 7034a89..0286b4b 100644
--- a/components/autofill/browser/autofill_external_delegate.cc
+++ b/components/autofill/browser/autofill_external_delegate.cc
@@ -13,8 +13,7 @@
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
-#include "grit/chromium_strings.h"
-#include "grit/generated_resources.h"
+#include "grit/component_resources.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebAutofillClient.h"
 #include "ui/base/l10n/l10n_util.h"
 
diff --git a/components/autofill/browser/autofill_manager.cc b/components/autofill/browser/autofill_manager.cc
index ff16c6b..b488ff6 100644
--- a/components/autofill/browser/autofill_manager.cc
+++ b/components/autofill/browser/autofill_manager.cc
@@ -51,7 +51,7 @@
 #include "content/public/browser/web_contents_view.h"
 #include "content/public/common/url_constants.h"
 #include "googleurl/src/gurl.h"
-#include "grit/generated_resources.h"
+#include "grit/component_resources.h"
 #include "ipc/ipc_message_macros.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebAutofillClient.h"
 #include "ui/base/l10n/l10n_util.h"
diff --git a/components/autofill/browser/autofill_manager_unittest.cc b/components/autofill/browser/autofill_manager_unittest.cc
index 1c9bd68..357fa73 100644
--- a/components/autofill/browser/autofill_manager_unittest.cc
+++ b/components/autofill/browser/autofill_manager_unittest.cc
@@ -45,7 +45,7 @@
 #include "content/public/test/test_browser_thread.h"
 #include "content/public/test/test_utils.h"
 #include "googleurl/src/gurl.h"
-#include "grit/generated_resources.h"
+#include "grit/component_resources.h"
 #include "ipc/ipc_test_sink.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/components/autofill/browser/autofill_profile.cc b/components/autofill/browser/autofill_profile.cc
index d2fe565..098a0db 100644
--- a/components/autofill/browser/autofill_profile.cc
+++ b/components/autofill/browser/autofill_profile.cc
@@ -23,7 +23,7 @@
 #include "components/autofill/browser/phone_number.h"
 #include "components/autofill/browser/phone_number_i18n.h"
 #include "components/autofill/common/form_field_data.h"
-#include "grit/generated_resources.h"
+#include "grit/component_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace autofill {
diff --git a/components/autofill/browser/autofill_profile_unittest.cc b/components/autofill/browser/autofill_profile_unittest.cc
index 4e68b88..78f58b5 100644
--- a/components/autofill/browser/autofill_profile_unittest.cc
+++ b/components/autofill/browser/autofill_profile_unittest.cc
@@ -13,7 +13,7 @@
 #include "components/autofill/browser/autofill_common_test.h"
 #include "components/autofill/browser/autofill_profile.h"
 #include "components/autofill/common/form_field_data.h"
-#include "grit/generated_resources.h"
+#include "grit/component_resources.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace autofill {
diff --git a/components/autofill/browser/credit_card.cc b/components/autofill/browser/credit_card.cc
index e7cbf5a..056a79c 100644
--- a/components/autofill/browser/credit_card.cc
+++ b/components/autofill/browser/credit_card.cc
@@ -23,7 +23,7 @@
 #include "components/autofill/browser/field_types.h"
 #include "components/autofill/browser/validation.h"
 #include "components/autofill/common/form_field_data.h"
-#include "grit/generated_resources.h"
+#include "grit/component_resources.h"
 #include "grit/webkit_resources.h"
 #include "third_party/icu/public/common/unicode/uloc.h"
 #include "third_party/icu/public/i18n/unicode/dtfmtsym.h"
diff --git a/components/autofill/browser/personal_data_manager_mac.mm b/components/autofill/browser/personal_data_manager_mac.mm
index 789357f..61d1c34 100644
--- a/components/autofill/browser/personal_data_manager_mac.mm
+++ b/components/autofill/browser/personal_data_manager_mac.mm
@@ -19,7 +19,7 @@
 #include "components/autofill/browser/autofill_country.h"
 #include "components/autofill/browser/autofill_profile.h"
 #include "components/autofill/browser/phone_number.h"
-#include "grit/generated_resources.h"
+#include "grit/component_resources.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 
 namespace autofill {
diff --git a/components/autofill/browser/wallet/wallet_items.cc b/components/autofill/browser/wallet/wallet_items.cc
index 6d99c5e..ff81bcc 100644
--- a/components/autofill/browser/wallet/wallet_items.cc
+++ b/components/autofill/browser/wallet/wallet_items.cc
@@ -11,7 +11,7 @@
 #include "components/autofill/browser/autofill_type.h"
 #include "components/autofill/browser/credit_card.h"
 #include "googleurl/src/gurl.h"
-#include "grit/generated_resources.h"
+#include "grit/component_resources.h"
 #include "grit/webkit_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
diff --git a/components/autofill/renderer/autofill_agent.cc b/components/autofill/renderer/autofill_agent.cc
index 27795c4..eff68be 100644
--- a/components/autofill/renderer/autofill_agent.cc
+++ b/components/autofill/renderer/autofill_agent.cc
@@ -25,8 +25,7 @@
 #include "content/public/common/password_form.h"
 #include "content/public/common/ssl_status.h"
 #include "content/public/renderer/render_view.h"
-#include "grit/chromium_strings.h"
-#include "grit/generated_resources.h"
+#include "grit/component_resources.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebRect.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebURLRequest.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDataSource.h"
diff --git a/components/autofill/renderer/form_cache.cc b/components/autofill/renderer/form_cache.cc
index 5d0bed0..988aa3d 100644
--- a/components/autofill/renderer/form_cache.cc
+++ b/components/autofill/renderer/form_cache.cc
@@ -12,7 +12,7 @@
 #include "components/autofill/common/form_field_data.h"
 #include "components/autofill/common/form_field_data_predictions.h"
 #include "components/autofill/renderer/form_autofill_util.h"
-#include "grit/generated_resources.h"
+#include "grit/component_resources.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebString.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebVector.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
diff --git a/components/component_resources.grd b/components/component_resources.grd
new file mode 100644
index 0000000..61d32395
--- /dev/null
+++ b/components/component_resources.grd
@@ -0,0 +1,212 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<grit latest_public_release="0" current_release="1"
+      source_lang_id="en" enc_check="möl">
+  <outputs>
+    <output filename="grit/component_resources.h" type="rc_header">
+      <emit emit_type='prepend'></emit>
+    </output>
+    <output filename="component_resources_am.pak" type="data_package" lang="am" />
+    <output filename="component_resources_ar.pak" type="data_package" lang="ar" />
+    <if expr="pp_ifdef('use_third_party_translations')">
+      <output filename="component_resources_ast.pak" type="data_package" lang="ast" />
+    </if>
+    <output filename="component_resources_bg.pak" type="data_package" lang="bg" />
+    <output filename="component_resources_bn.pak" type="data_package" lang="bn" />
+    <if expr="pp_ifdef('use_third_party_translations')">
+      <output filename="component_resources_bs.pak" type="data_package" lang="bs" />
+    </if>
+    <output filename="component_resources_ca.pak" type="data_package" lang="ca" />
+    <if expr="pp_ifdef('use_third_party_translations')">
+      <output filename="component_resources_ca@valencia.pak" type="data_package" lang="ca@valencia" />
+    </if>
+    <output filename="component_resources_cs.pak" type="data_package" lang="cs" />
+    <output filename="component_resources_da.pak" type="data_package" lang="da" />
+    <output filename="component_resources_de.pak" type="data_package" lang="de" />
+    <output filename="component_resources_el.pak" type="data_package" lang="el" />
+    <if expr="pp_ifdef('use_third_party_translations')">
+      <output filename="component_resources_en-AU.pak" type="data_package" lang="en-AU" />
+    </if>
+    <output filename="component_resources_en-GB.pak" type="data_package" lang="en-GB" />
+    <output filename="component_resources_en-US.pak" type="data_package" lang="en" />
+    <if expr="pp_ifdef('use_third_party_translations')">
+      <output filename="component_resources_eo.pak" type="data_package" lang="eo" />
+    </if>
+    <output filename="component_resources_es.pak" type="data_package" lang="es" />
+    <output filename="component_resources_es-419.pak" type="data_package" lang="es-419" />
+    <output filename="component_resources_et.pak" type="data_package" lang="et" />
+    <if expr="pp_ifdef('use_third_party_translations')">
+      <output filename="component_resources_eu.pak" type="data_package" lang="eu" />
+    </if>
+    <output filename="component_resources_fa.pak" type="data_package" lang="fa" />
+    <output filename="component_resources_fake-bidi.pak" type="data_package" lang="fake-bidi" />
+    <output filename="component_resources_fi.pak" type="data_package" lang="fi" />
+    <output filename="component_resources_fil.pak" type="data_package" lang="fil" />
+    <output filename="component_resources_fr.pak" type="data_package" lang="fr" />
+    <if expr="pp_ifdef('use_third_party_translations')">
+      <output filename="component_resources_gl.pak" type="data_package" lang="gl" />
+    </if>
+    <output filename="component_resources_gu.pak" type="data_package" lang="gu" />
+    <output filename="component_resources_he.pak" type="data_package" lang="he" />
+    <output filename="component_resources_hi.pak" type="data_package" lang="hi" />
+    <output filename="component_resources_hr.pak" type="data_package" lang="hr" />
+    <output filename="component_resources_hu.pak" type="data_package" lang="hu" />
+    <if expr="pp_ifdef('use_third_party_translations')">
+      <output filename="component_resources_hy.pak" type="data_package" lang="hy" />
+      <output filename="component_resources_ia.pak" type="data_package" lang="ia" />
+    </if>
+    <output filename="component_resources_id.pak" type="data_package" lang="id" />
+    <output filename="component_resources_it.pak" type="data_package" lang="it" />
+    <output filename="component_resources_ja.pak" type="data_package" lang="ja" />
+    <if expr="pp_ifdef('use_third_party_translations')">
+      <output filename="component_resources_ka.pak" type="data_package" lang="ka" />
+    </if>
+    <output filename="component_resources_kn.pak" type="data_package" lang="kn" />
+    <output filename="component_resources_ko.pak" type="data_package" lang="ko" />
+    <if expr="pp_ifdef('use_third_party_translations')">
+      <output filename="component_resources_ku.pak" type="data_package" lang="ku" />
+      <output filename="component_resources_kw.pak" type="data_package" lang="kw" />
+    </if>
+    <output filename="component_resources_lt.pak" type="data_package" lang="lt" />
+    <output filename="component_resources_lv.pak" type="data_package" lang="lv" />
+    <output filename="component_resources_ml.pak" type="data_package" lang="ml" />
+    <output filename="component_resources_mr.pak" type="data_package" lang="mr" />
+    <output filename="component_resources_ms.pak" type="data_package" lang="ms" />
+    <output filename="component_resources_nl.pak" type="data_package" lang="nl" />
+    <!-- The translation console uses 'no' for Norwegian Bokmål. It should
+         be 'nb'. -->
+    <output filename="component_resources_nb.pak" type="data_package" lang="no" />
+    <output filename="component_resources_pl.pak" type="data_package" lang="pl" />
+    <if expr="pp_ifdef('ios')">
+      <!-- iOS uses pt for pt-BR -->
+      <output filename="component_resources_pt.pak" type="data_package" lang="pt-BR" />
+    </if>
+    <if expr="not pp_ifdef('ios')">
+      <output filename="component_resources_pt-BR.pak" type="data_package" lang="pt-BR" />
+    </if>
+    <output filename="component_resources_pt-PT.pak" type="data_package" lang="pt-PT" />
+    <output filename="component_resources_ro.pak" type="data_package" lang="ro" />
+    <output filename="component_resources_ru.pak" type="data_package" lang="ru" />
+    <output filename="component_resources_sk.pak" type="data_package" lang="sk" />
+    <output filename="component_resources_sl.pak" type="data_package" lang="sl" />
+    <output filename="component_resources_sr.pak" type="data_package" lang="sr" />
+    <output filename="component_resources_sv.pak" type="data_package" lang="sv" />
+    <output filename="component_resources_sw.pak" type="data_package" lang="sw" />
+    <output filename="component_resources_ta.pak" type="data_package" lang="ta" />
+    <output filename="component_resources_te.pak" type="data_package" lang="te" />
+    <output filename="component_resources_th.pak" type="data_package" lang="th" />
+    <output filename="component_resources_tr.pak" type="data_package" lang="tr" />
+    <if expr="pp_ifdef('use_third_party_translations')">
+      <output filename="component_resources_ug.pak" type="data_package" lang="ug" />
+    </if>
+    <output filename="component_resources_uk.pak" type="data_package" lang="uk" />
+    <output filename="component_resources_vi.pak" type="data_package" lang="vi" />
+    <output filename="component_resources_zh-CN.pak" type="data_package" lang="zh-CN" />
+    <output filename="component_resources_zh-TW.pak" type="data_package" lang="zh-TW" />
+  </outputs>
+  <release seq="1" allow_pseudo="false">
+    <messages fallback_to_english="true">
+      <message name="IDS_AUTOFILL_CLEAR_FORM_MENU_ITEM" desc="The entry in the suggestions dropdown that clears an auto-filled form.">
+        Clear form
+      </message>
+      <message name="IDS_AUTOFILL_WARNING_FORM_DISABLED" desc="Warning text to show when autofill is disabled by the website for a given form.">
+        This webpage has disabled automatic filling for this form.
+      </message>
+      <message name="IDS_AUTOFILL_WARNING_INSECURE_CONNECTION" desc="Warning text to show when credit card autofill is disabled because the website is not using a secure connection.">
+        Automatic credit card filling is disabled because this form does not use a secure connection.
+      </message>
+      <message name="IDS_AUTOFILL_CC_AMEX" desc="American Express credit card name.">
+        American Express
+      </message>
+      <message name="IDS_AUTOFILL_CC_DINERS" desc="Diners Club credit card name.">
+        Diners Club
+      </message>
+      <message name="IDS_AUTOFILL_CC_DISCOVER" desc="Discover credit card name.">
+        Discover
+      </message>
+      <message name="IDS_AUTOFILL_CC_JCB" desc="JCB credit card name.">
+        JCB
+      </message>
+      <message name="IDS_AUTOFILL_CC_MASTERCARD" desc="MasterCard credit card name.">
+        MasterCard
+      </message>
+      <message name="IDS_AUTOFILL_CC_SOLO" desc="Solo debit card name.">
+        Solo
+      </message>
+      <message name="IDS_AUTOFILL_CC_VISA" desc="Visa credit card name.">
+        Visa
+      </message>
+      <message name="IDS_AUTOFILL_MAC_ADDRESS_LINE_SEPARATOR" desc="The separator character used to join multi-line addresses on the Mac.">
+        , '''
+      </message>
+      <message name="IDS_AUTOFILL_ADDRESS_SUMMARY_SEPARATOR" desc="The separator character used in the summary of an address.">
+        , '''
+      </message>
+      <message name="IDS_CREDIT_CARD_NUMBER_PREVIEW_FORMAT"
+               desc="Credit card preview format">
+        <ph name="OBFUSCATED_CC_NUMBER">$1<ex>************1234</ex>
+        </ph>, Exp: <ph name="CC_EXPIRATION_DATE">$2<ex>03/2020</ex>
+        </ph>
+      </message>
+
+      <!-- These are all variants of the same logical field: The major subdivision below the "country" level. -->
+      <message name="IDS_AUTOFILL_FIELD_LABEL_STATE" desc="The label of the State entry.">
+        State
+      </message>
+      <message name="IDS_AUTOFILL_FIELD_LABEL_AREA" desc="The label of the Area entry.">
+        Area
+      </message>
+      <message name="IDS_AUTOFILL_FIELD_LABEL_COUNTY" desc="The label of the County entry.">
+        County
+      </message>
+      <message name="IDS_AUTOFILL_FIELD_LABEL_DEPARTMENT" desc="The label of the Department entry.">
+        Department
+      </message>
+      <message name="IDS_AUTOFILL_FIELD_LABEL_DISTRICT" desc="The label of the District entry.">
+        District
+      </message>
+      <message name="IDS_AUTOFILL_FIELD_LABEL_EMIRATE" desc="The label of the Emirate entry.">
+        Emirate
+      </message>
+      <message name="IDS_AUTOFILL_FIELD_LABEL_ISLAND" desc="The label of the Island entry.">
+        Island
+      </message>
+      <message name="IDS_AUTOFILL_FIELD_LABEL_PARISH" desc="The label of the Parish entry.">
+        Parish
+      </message>
+      <message name="IDS_AUTOFILL_FIELD_LABEL_PREFECTURE" desc="The label of the Prefecture entry.">
+        Prefecture
+      </message>
+      <message name="IDS_AUTOFILL_FIELD_LABEL_PROVINCE" desc="The label of the Province entry.">
+        Province
+      </message>
+      <!-- End state variants. -->
+      <message name="IDS_AUTOFILL_FIELD_LABEL_ZIP_CODE" desc="The label of the ZIP code entry.">
+        ZIP code
+      </message>
+      <message name="IDS_AUTOFILL_FIELD_LABEL_POSTAL_CODE" desc="The label of the Postal code entry.">
+        Postal code
+      </message>
+      <message name="IDS_AUTOFILL_FIELD_LABEL_COUNTRY" desc="The label of the Country entry.">
+        Country
+      </message>
+
+      <message name="IDS_AUTOFILL_SHOW_PREDICTIONS_TITLE" desc="The title for form elements when annotated with Autofill predictions.">
+heuristic type: <ph name="HEURISTIC_TYPE">$1<ex>NAME_FIRST</ex></ph>
+server type: <ph name="SERVER_TYPE">$2<ex>NAME_FIRST</ex></ph>
+field signature: <ph name="FIELD_SIGNATURE">$3<ex>12345678</ex></ph>
+form signature: <ph name="FORM_SIGNATURE">$4<ex>1234567812345678</ex></ph>
+experiment id: "<ph name="EXPERIMENT_ID">$5<ex>ar1</ex></ph>"
+      </message>
+
+      <!-- Autofill dialog: legal documents -->
+      <message name="IDS_AUTOFILL_DIALOG_PRIVACY_POLICY_LINK" desc="The text of an extra link that is appended to the end of whatever other legal documents need to be accepted or updated.">
+        Privacy Policy
+      </message>
+
+      <message name="IDS_AUTOFILL_OPTIONS_POPUP" desc="The value of the Autofill options menu entry.">
+        Chrome Autofill settings
+      </message>
+    </messages>
+  </release>
+</grit>
diff --git a/components/component_resources.gyp b/components/component_resources.gyp
new file mode 100644
index 0000000..94839c1
--- /dev/null
+++ b/components/component_resources.gyp
@@ -0,0 +1,30 @@
+# Copyright (c) 2012 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+{
+  'variables': {
+    'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
+  },
+  'targets': [
+    {
+      'target_name': 'component_resources',
+      'type': 'none',
+      'actions': [
+        {
+          'action_name': 'component_resources',
+          'variables': {
+            'grit_grd_file': 'component_resources.grd',
+            'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/component_resources',
+          },
+          'includes': [ '../build/grit_action.gypi' ],
+        },
+      ],
+     'direct_dependent_settings': {
+        'include_dirs': [
+            '<(SHARED_INTERMEDIATE_DIR)/component_resources',
+          ],
+        },
+    },
+  ],
+}