| Index: components/autofill.gypi
|
| diff --git a/components/autofill.gypi b/components/autofill.gypi
|
| index db00537cfec00255a2e58f52c06d0394b34d8ea6..ebd4cf0ad6ee04cbb5ffc550411536d037157f62 100644
|
| --- a/components/autofill.gypi
|
| +++ b/components/autofill.gypi
|
| @@ -12,14 +12,14 @@
|
| 'action_name': 'autofill_regexes',
|
| 'inputs': [
|
| '<(DEPTH)/build/escape_unicode.py',
|
| - 'autofill/browser/autofill_regex_constants.cc.utf8',
|
| + 'autofill/core/browser/autofill_regex_constants.cc.utf8',
|
| ],
|
| 'outputs': [
|
| '<(SHARED_INTERMEDIATE_DIR)/autofill_regex_constants.cc',
|
| ],
|
| 'action': ['python', '<(DEPTH)/build/escape_unicode.py',
|
| '-o', '<(SHARED_INTERMEDIATE_DIR)',
|
| - 'autofill/browser/autofill_regex_constants.cc.utf8'],
|
| + 'autofill/core/browser/autofill_regex_constants.cc.utf8'],
|
| }],
|
| },
|
| ],
|
| @@ -49,13 +49,13 @@
|
| '<(SHARED_INTERMEDIATE_DIR)/autofill'
|
| ],
|
| 'sources': [
|
| - 'autofill/browser/android/auxiliary_profile_loader_android.cc',
|
| - 'autofill/browser/android/auxiliary_profile_loader_android.h',
|
| - 'autofill/browser/android/auxiliary_profiles_android.cc',
|
| - 'autofill/browser/android/auxiliary_profiles_android.h',
|
| - 'autofill/browser/android/component_jni_registrar.cc',
|
| - 'autofill/browser/android/component_jni_registrar.h',
|
| - 'autofill/browser/android/personal_data_manager_android.cc',
|
| + 'autofill/core/browser/android/auxiliary_profile_loader_android.cc',
|
| + 'autofill/core/browser/android/auxiliary_profile_loader_android.h',
|
| + 'autofill/core/browser/android/auxiliary_profiles_android.cc',
|
| + 'autofill/core/browser/android/auxiliary_profiles_android.h',
|
| + 'autofill/core/browser/android/component_jni_registrar.cc',
|
| + 'autofill/core/browser/android/component_jni_registrar.h',
|
| + 'autofill/core/browser/android/personal_data_manager_android.cc',
|
| 'autofill/core/common/autocheckout_status.h',
|
| 'autofill/core/common/autofill_constants.cc',
|
| 'autofill/core/common/autofill_constants.h',
|
| @@ -84,9 +84,7 @@
|
| },
|
|
|
| {
|
| - # TODO(blundell): Move this target to autofill_core_browser.
|
| - # crbug.com/247015
|
| - 'target_name': 'autofill_browser',
|
| + 'target_name': 'autofill_core_browser',
|
| 'type': 'static_library',
|
| 'include_dirs': [
|
| '..',
|
| @@ -117,96 +115,96 @@
|
| 'component_strings.gyp:component_strings',
|
| ],
|
| 'sources': [
|
| - 'autofill/browser/address.cc',
|
| - 'autofill/browser/address.h',
|
| - 'autofill/browser/address_field.cc',
|
| - 'autofill/browser/address_field.h',
|
| - '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_data_model.cc',
|
| - 'autofill/browser/autofill_data_model.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_driver.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',
|
| - 'autofill/browser/autofill_manager.h',
|
| - 'autofill/browser/autofill_manager_delegate.h',
|
| - 'autofill/browser/autofill_manager_test_delegate.h',
|
| - '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',
|
| - 'autofill/browser/name_field.h',
|
| - 'autofill/browser/password_autofill_manager.cc',
|
| - 'autofill/browser/password_autofill_manager.h',
|
| - 'autofill/browser/password_generator.cc',
|
| - 'autofill/browser/password_generator.h',
|
| - 'autofill/browser/personal_data_manager.cc',
|
| - 'autofill/browser/personal_data_manager.h',
|
| - 'autofill/browser/personal_data_manager_mac.mm',
|
| - '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/state_names.cc',
|
| - 'autofill/browser/state_names.h',
|
| - 'autofill/browser/validation.cc',
|
| - 'autofill/browser/validation.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_backend.h',
|
| - 'autofill/browser/webdata/autofill_webdata_backend_impl.cc',
|
| - 'autofill/browser/webdata/autofill_webdata_backend_impl.h',
|
| - 'autofill/browser/webdata/autofill_webdata_service.cc',
|
| - 'autofill/browser/webdata/autofill_webdata_service.h',
|
| - 'autofill/browser/webdata/autofill_webdata_service_observer.h',
|
| + 'autofill/core/browser/address.cc',
|
| + 'autofill/core/browser/address.h',
|
| + 'autofill/core/browser/address_field.cc',
|
| + 'autofill/core/browser/address_field.h',
|
| + 'autofill/core/browser/autocomplete_history_manager.cc',
|
| + 'autofill/core/browser/autocomplete_history_manager.h',
|
| + 'autofill/core/browser/autofill-inl.h',
|
| + 'autofill/core/browser/autofill_country.cc',
|
| + 'autofill/core/browser/autofill_country.h',
|
| + 'autofill/core/browser/autofill_data_model.cc',
|
| + 'autofill/core/browser/autofill_data_model.h',
|
| + 'autofill/core/browser/autofill_download.cc',
|
| + 'autofill/core/browser/autofill_download.h',
|
| + 'autofill/core/browser/autofill_download_url.cc',
|
| + 'autofill/core/browser/autofill_download_url.h',
|
| + 'autofill/core/browser/autofill_driver.h',
|
| + 'autofill/core/browser/autofill_external_delegate.cc',
|
| + 'autofill/core/browser/autofill_external_delegate.h',
|
| + 'autofill/core/browser/autofill_field.cc',
|
| + 'autofill/core/browser/autofill_field.h',
|
| + 'autofill/core/browser/autofill_ie_toolbar_import_win.cc',
|
| + 'autofill/core/browser/autofill_ie_toolbar_import_win.h',
|
| + 'autofill/core/browser/autofill_manager.cc',
|
| + 'autofill/core/browser/autofill_manager.h',
|
| + 'autofill/core/browser/autofill_manager_delegate.h',
|
| + 'autofill/core/browser/autofill_manager_test_delegate.h',
|
| + 'autofill/core/browser/autofill_metrics.cc',
|
| + 'autofill/core/browser/autofill_metrics.h',
|
| + 'autofill/core/browser/autofill_popup_delegate.h',
|
| + 'autofill/core/browser/autofill_profile.cc',
|
| + 'autofill/core/browser/autofill_profile.h',
|
| + 'autofill/core/browser/autofill_regex_constants.cc.utf8',
|
| + 'autofill/core/browser/autofill_regex_constants.h',
|
| + 'autofill/core/browser/autofill_regexes.cc',
|
| + 'autofill/core/browser/autofill_regexes.h',
|
| + 'autofill/core/browser/autofill_scanner.cc',
|
| + 'autofill/core/browser/autofill_scanner.h',
|
| + 'autofill/core/browser/autofill_server_field_info.h',
|
| + 'autofill/core/browser/autofill_type.cc',
|
| + 'autofill/core/browser/autofill_type.h',
|
| + 'autofill/core/browser/autofill_xml_parser.cc',
|
| + 'autofill/core/browser/autofill_xml_parser.h',
|
| + 'autofill/core/browser/contact_info.cc',
|
| + 'autofill/core/browser/contact_info.h',
|
| + 'autofill/core/browser/credit_card.cc',
|
| + 'autofill/core/browser/credit_card.h',
|
| + 'autofill/core/browser/credit_card_field.cc',
|
| + 'autofill/core/browser/credit_card_field.h',
|
| + 'autofill/core/browser/email_field.cc',
|
| + 'autofill/core/browser/email_field.h',
|
| + 'autofill/core/browser/field_types.h',
|
| + 'autofill/core/browser/form_field.cc',
|
| + 'autofill/core/browser/form_field.h',
|
| + 'autofill/core/browser/form_group.cc',
|
| + 'autofill/core/browser/form_group.h',
|
| + 'autofill/core/browser/form_structure.cc',
|
| + 'autofill/core/browser/form_structure.h',
|
| + 'autofill/core/browser/name_field.cc',
|
| + 'autofill/core/browser/name_field.h',
|
| + 'autofill/core/browser/password_autofill_manager.cc',
|
| + 'autofill/core/browser/password_autofill_manager.h',
|
| + 'autofill/core/browser/password_generator.cc',
|
| + 'autofill/core/browser/password_generator.h',
|
| + 'autofill/core/browser/personal_data_manager.cc',
|
| + 'autofill/core/browser/personal_data_manager.h',
|
| + 'autofill/core/browser/personal_data_manager_mac.mm',
|
| + 'autofill/core/browser/personal_data_manager_observer.h',
|
| + 'autofill/core/browser/phone_field.cc',
|
| + 'autofill/core/browser/phone_field.h',
|
| + 'autofill/core/browser/phone_number.cc',
|
| + 'autofill/core/browser/phone_number.h',
|
| + 'autofill/core/browser/phone_number_i18n.cc',
|
| + 'autofill/core/browser/phone_number_i18n.h',
|
| + 'autofill/core/browser/state_names.cc',
|
| + 'autofill/core/browser/state_names.h',
|
| + 'autofill/core/browser/validation.cc',
|
| + 'autofill/core/browser/validation.h',
|
| + 'autofill/core/browser/webdata/autofill_change.cc',
|
| + 'autofill/core/browser/webdata/autofill_change.h',
|
| + 'autofill/core/browser/webdata/autofill_entry.cc',
|
| + 'autofill/core/browser/webdata/autofill_entry.h',
|
| + 'autofill/core/browser/webdata/autofill_table.cc',
|
| + 'autofill/core/browser/webdata/autofill_table.h',
|
| + 'autofill/core/browser/webdata/autofill_webdata.h',
|
| + 'autofill/core/browser/webdata/autofill_webdata_backend.h',
|
| + 'autofill/core/browser/webdata/autofill_webdata_backend_impl.cc',
|
| + 'autofill/core/browser/webdata/autofill_webdata_backend_impl.h',
|
| + 'autofill/core/browser/webdata/autofill_webdata_service.cc',
|
| + 'autofill/core/browser/webdata/autofill_webdata_service.h',
|
| + 'autofill/core/browser/webdata/autofill_webdata_service_observer.h',
|
|
|
| # This file is generated by the autofill_regexes action.
|
| '<(SHARED_INTERMEDIATE_DIR)/autofill_regex_constants.cc',
|
| @@ -245,8 +243,8 @@
|
| '..',
|
| ],
|
| 'dependencies': [
|
| - 'autofill_browser',
|
| 'autofill_content_risk_proto',
|
| + 'autofill_core_browser',
|
| 'autofill_core_common',
|
| 'autofill_regexes',
|
| 'encryptor',
|
| @@ -358,7 +356,7 @@
|
| '../content/content.gyp:content_java',
|
| ],
|
| 'variables': {
|
| - 'java_in_dir': 'autofill/browser/android/java',
|
| + 'java_in_dir': 'autofill/core/browser/android/java',
|
| },
|
| 'includes': [ '../build/java.gypi' ],
|
| },
|
| @@ -366,7 +364,7 @@
|
| 'target_name': 'autofill_jni_headers',
|
| 'type': 'none',
|
| 'sources': [
|
| - 'autofill/browser/android/java/src/org/chromium/components/browser/autofill/PersonalAutofillPopulator.java',
|
| + 'autofill/core/browser/android/java/src/org/chromium/components/browser/autofill/PersonalAutofillPopulator.java',
|
| ],
|
| 'variables': {
|
| 'jni_gen_package': 'autofill',
|
|
|