Index: components/autofill.gypi |
diff --git a/components/autofill.gypi b/components/autofill.gypi |
index 42594ad403be4aac254da151b37d91a90f8950be..a6a5b7eb5d98561fc80f0503406e9181a31fcf1d 100644 |
--- a/components/autofill.gypi |
+++ b/components/autofill.gypi |
@@ -94,86 +94,38 @@ |
}, |
{ |
- # A few types used by autofill_browser that are also referenced in |
- # other components. |
- 'target_name': 'autofill_browser_types', |
- 'type': 'static_library', |
- 'include_dirs': [ |
- '..', |
- ], |
- 'dependencies': [ |
- 'autofill_common', |
- 'autofill_regexes', |
- '../base/base.gyp:base', |
- '../third_party/icu/icu.gyp:icui18n', |
- '../third_party/icu/icu.gyp:icuuc', |
- '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber', |
- '../ui/ui.gyp:ui', |
- '../webkit/support/webkit_support.gyp:webkit_resources', |
- |
- # For grip/generated_resources.h |
- # TODO(kaiwang): Remove this dependency on chrome. |
- '../chrome/chrome_resources.gyp:chrome_strings', |
- ], |
- 'sources': [ |
- 'autofill/browser/address.cc', |
- 'autofill/browser/address.h', |
- 'autofill/browser/autofill_country.cc', |
- 'autofill/browser/autofill_country.h', |
- 'autofill/browser/autofill_field.cc', |
- 'autofill/browser/autofill_field.h', |
- 'autofill/browser/autofill_profile.cc', |
- 'autofill/browser/autofill_profile.h', |
- 'autofill/browser/autofill_regexes.cc', |
- 'autofill/browser/autofill_regexes.h', |
- 'autofill/browser/autofill_type.cc', |
- 'autofill/browser/autofill_type.h', |
- 'autofill/browser/contact_info.cc', |
- 'autofill/browser/contact_info.h', |
- 'autofill/browser/credit_card.cc', |
- 'autofill/browser/credit_card.h', |
- 'autofill/browser/field_types.h', |
- 'autofill/browser/form_group.cc', |
- 'autofill/browser/form_group.h', |
- 'autofill/browser/phone_number.cc', |
- 'autofill/browser/phone_number.h', |
- 'autofill/browser/phone_number_i18n.cc', |
- 'autofill/browser/phone_number_i18n.h', |
- 'autofill/browser/validation.cc', |
- 'autofill/browser/validation.h', |
- ], |
- |
- # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. |
- 'msvs_disabled_warnings': [4267, ], |
- }, |
- |
- { |
'target_name': 'autofill_browser', |
'type': 'static_library', |
'include_dirs': [ |
'..', |
], |
'dependencies': [ |
- 'autofill_browser_types', |
'autofill_common', |
'autofill_regexes', |
'autofill_risk_proto', |
+ 'encryptor', |
+ 'webdata_common', |
'../base/base.gyp:base', |
+ '../base/base.gyp:base_i18n', |
'../build/temp_gyp/googleurl.gyp:googleurl', |
'../content/content.gyp:content_browser', |
'../content/content.gyp:content_common', |
'../ipc/ipc.gyp:ipc', |
'../skia/skia.gyp:skia', |
+ '../third_party/icu/icu.gyp:icui18n', |
+ '../third_party/icu/icu.gyp:icuuc', |
'../third_party/libjingle/libjingle.gyp:libjingle', |
+ '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber', |
+ '../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', |
- |
- # TODO(kaiwang): Add webdata after it's fully componentized. |
], |
'sources': [ |
+ 'autofill/browser/address.cc', |
+ 'autofill/browser/address.h', |
'autofill/browser/address_field.cc', |
'autofill/browser/address_field.h', |
'autofill/browser/autocheckout/whitelist_manager.cc', |
@@ -187,12 +139,16 @@ |
'autofill/browser/autocomplete_history_manager.cc', |
'autofill/browser/autocomplete_history_manager.h', |
'autofill/browser/autofill-inl.h', |
+ 'autofill/browser/autofill_country.cc', |
+ 'autofill/browser/autofill_country.h', |
'autofill/browser/autofill_download.cc', |
'autofill/browser/autofill_download.h', |
'autofill/browser/autofill_download_url.cc', |
'autofill/browser/autofill_download_url.h', |
'autofill/browser/autofill_external_delegate.cc', |
'autofill/browser/autofill_external_delegate.h', |
+ 'autofill/browser/autofill_field.cc', |
+ 'autofill/browser/autofill_field.h', |
'autofill/browser/autofill_ie_toolbar_import_win.cc', |
'autofill/browser/autofill_ie_toolbar_import_win.h', |
'autofill/browser/autofill_manager.cc', |
@@ -202,19 +158,32 @@ |
'autofill/browser/autofill_metrics.cc', |
'autofill/browser/autofill_metrics.h', |
'autofill/browser/autofill_popup_delegate.h', |
+ 'autofill/browser/autofill_profile.cc', |
+ 'autofill/browser/autofill_profile.h', |
'autofill/browser/autofill_regex_constants.cc.utf8', |
'autofill/browser/autofill_regex_constants.h', |
+ 'autofill/browser/autofill_regexes.cc', |
+ 'autofill/browser/autofill_regexes.h', |
'autofill/browser/autofill_scanner.cc', |
'autofill/browser/autofill_scanner.h', |
'autofill/browser/autofill_server_field_info.h', |
+ 'autofill/browser/autofill_type.cc', |
+ 'autofill/browser/autofill_type.h', |
'autofill/browser/autofill_xml_parser.cc', |
'autofill/browser/autofill_xml_parser.h', |
+ 'autofill/browser/contact_info.cc', |
+ 'autofill/browser/contact_info.h', |
+ 'autofill/browser/credit_card.cc', |
+ 'autofill/browser/credit_card.h', |
'autofill/browser/credit_card_field.cc', |
'autofill/browser/credit_card_field.h', |
'autofill/browser/email_field.cc', |
'autofill/browser/email_field.h', |
+ 'autofill/browser/field_types.h', |
'autofill/browser/form_field.cc', |
'autofill/browser/form_field.h', |
+ 'autofill/browser/form_group.cc', |
+ 'autofill/browser/form_group.h', |
'autofill/browser/form_structure.cc', |
'autofill/browser/form_structure.h', |
'autofill/browser/name_field.cc', |
@@ -229,8 +198,14 @@ |
'autofill/browser/personal_data_manager_observer.h', |
'autofill/browser/phone_field.cc', |
'autofill/browser/phone_field.h', |
+ 'autofill/browser/phone_number.cc', |
+ 'autofill/browser/phone_number.h', |
+ 'autofill/browser/phone_number_i18n.cc', |
+ 'autofill/browser/phone_number_i18n.h', |
'autofill/browser/risk/fingerprint.cc', |
'autofill/browser/risk/fingerprint.h', |
+ 'autofill/browser/validation.cc', |
+ 'autofill/browser/validation.h', |
'autofill/browser/wallet/cart.cc', |
'autofill/browser/wallet/cart.h', |
'autofill/browser/wallet/encryption_escrow_client.cc', |
@@ -253,6 +228,16 @@ |
'autofill/browser/wallet/wallet_service_url.h', |
'autofill/browser/wallet/wallet_signin_helper.cc', |
'autofill/browser/wallet/wallet_signin_helper.h', |
+ 'autofill/browser/webdata/autofill_change.cc', |
+ 'autofill/browser/webdata/autofill_change.h', |
+ 'autofill/browser/webdata/autofill_entry.cc', |
+ 'autofill/browser/webdata/autofill_entry.h', |
+ 'autofill/browser/webdata/autofill_table.cc', |
+ 'autofill/browser/webdata/autofill_table.h', |
+ 'autofill/browser/webdata/autofill_webdata.h', |
+ 'autofill/browser/webdata/autofill_webdata_service.cc', |
+ 'autofill/browser/webdata/autofill_webdata_service.h', |
+ 'autofill/browser/webdata/autofill_webdata_service_observer.h', |
# This file is generated by the autofill_regexes action. |
'<(SHARED_INTERMEDIATE_DIR)/autofill_regex_constants.cc', |