diff options
| -rw-r--r-- | chrome/chrome_browser.gypi | 113 | ||||
| -rw-r--r-- | chrome/chrome_renderer.gypi | 25 | ||||
| -rw-r--r-- | components/OWNERS | 4 | ||||
| -rw-r--r-- | components/autofill.gypi | 177 |
4 files changed, 187 insertions, 132 deletions
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index b4d2140..62f3b29 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -2136,121 +2136,11 @@ 'test/perf/perf_test.cc', 'test/perf/perf_test.h', - # TODO(joi): Move to //components/components.gypi once - # remaining dependencies back to //chrome are eliminated. - '../components/autofill/browser/address.cc', - '../components/autofill/browser/address.h', - '../components/autofill/browser/address_field.cc', - '../components/autofill/browser/address_field.h', - '../components/autofill/browser/autocheckout/whitelist_manager.cc', - '../components/autofill/browser/autocheckout/whitelist_manager.h', - '../components/autofill/browser/autocheckout_manager.cc', - '../components/autofill/browser/autocheckout_manager.h', - '../components/autofill/browser/autocheckout_page_meta_data.cc', - '../components/autofill/browser/autocheckout_page_meta_data.h', - '../components/autofill/browser/autocheckout_request_manager.cc', - '../components/autofill/browser/autocheckout_request_manager.h', - '../components/autofill/browser/autocomplete_history_manager.cc', - '../components/autofill/browser/autocomplete_history_manager.h', - '../components/autofill/browser/autofill-inl.h', - '../components/autofill/browser/autofill_country.cc', - '../components/autofill/browser/autofill_country.h', - '../components/autofill/browser/autofill_download.cc', - '../components/autofill/browser/autofill_download.h', - '../components/autofill/browser/autofill_download_url.cc', - '../components/autofill/browser/autofill_download_url.h', - '../components/autofill/browser/autofill_external_delegate.cc', - '../components/autofill/browser/autofill_external_delegate.h', - '../components/autofill/browser/autofill_field.cc', - '../components/autofill/browser/autofill_field.h', - '../components/autofill/browser/autofill_ie_toolbar_import_win.cc', - '../components/autofill/browser/autofill_ie_toolbar_import_win.h', - '../components/autofill/browser/autofill_manager.cc', - '../components/autofill/browser/autofill_manager.h', - '../components/autofill/browser/autofill_manager_delegate.h', - '../components/autofill/browser/autofill_manager_test_delegate.h', - '../components/autofill/browser/autofill_metrics.cc', - '../components/autofill/browser/autofill_metrics.h', - '../components/autofill/browser/autofill_popup_delegate.h', - '../components/autofill/browser/autofill_profile.cc', - '../components/autofill/browser/autofill_profile.h', - '../components/autofill/browser/autofill_regex_constants.cc.utf8', - '../components/autofill/browser/autofill_regex_constants.h', - '../components/autofill/browser/autofill_regexes.cc', - '../components/autofill/browser/autofill_regexes.h', - '../components/autofill/browser/autofill_scanner.cc', - '../components/autofill/browser/autofill_scanner.h', - '../components/autofill/browser/autofill_server_field_info.h', - '../components/autofill/browser/autofill_type.cc', - '../components/autofill/browser/autofill_type.h', - '../components/autofill/browser/autofill_xml_parser.cc', - '../components/autofill/browser/autofill_xml_parser.h', - '../components/autofill/browser/contact_info.cc', - '../components/autofill/browser/contact_info.h', - '../components/autofill/browser/credit_card.cc', - '../components/autofill/browser/credit_card.h', - '../components/autofill/browser/credit_card_field.cc', - '../components/autofill/browser/credit_card_field.h', - '../components/autofill/browser/email_field.cc', - '../components/autofill/browser/email_field.h', - '../components/autofill/browser/field_types.h', - '../components/autofill/browser/form_field.cc', - '../components/autofill/browser/form_field.h', - '../components/autofill/browser/form_group.cc', - '../components/autofill/browser/form_group.h', - '../components/autofill/browser/form_structure.cc', - '../components/autofill/browser/form_structure.h', - '../components/autofill/browser/name_field.cc', - '../components/autofill/browser/name_field.h', - '../components/autofill/browser/password_autofill_manager.cc', - '../components/autofill/browser/password_autofill_manager.h', - '../components/autofill/browser/password_generator.cc', - '../components/autofill/browser/password_generator.h', - '../components/autofill/browser/personal_data_manager.cc', - '../components/autofill/browser/personal_data_manager.h', - '../components/autofill/browser/personal_data_manager_mac.mm', - '../components/autofill/browser/personal_data_manager_observer.h', - '../components/autofill/browser/phone_field.cc', - '../components/autofill/browser/phone_field.h', - '../components/autofill/browser/phone_number.cc', - '../components/autofill/browser/phone_number.h', - '../components/autofill/browser/phone_number_i18n.cc', - '../components/autofill/browser/phone_number_i18n.h', - '../components/autofill/browser/risk/fingerprint.cc', - '../components/autofill/browser/risk/fingerprint.h', - '../components/autofill/browser/validation.cc', - '../components/autofill/browser/validation.h', - '../components/autofill/browser/wallet/cart.cc', - '../components/autofill/browser/wallet/cart.h', - '../components/autofill/browser/wallet/encryption_escrow_client.cc', - '../components/autofill/browser/wallet/encryption_escrow_client.h', - '../components/autofill/browser/wallet/encryption_escrow_client_observer.h', - '../components/autofill/browser/wallet/full_wallet.cc', - '../components/autofill/browser/wallet/full_wallet.h', - '../components/autofill/browser/wallet/instrument.cc', - '../components/autofill/browser/wallet/instrument.h', - '../components/autofill/browser/wallet/required_action.cc', - '../components/autofill/browser/wallet/required_action.h', - '../components/autofill/browser/wallet/wallet_address.cc', - '../components/autofill/browser/wallet/wallet_address.h', - '../components/autofill/browser/wallet/wallet_client.cc', - '../components/autofill/browser/wallet/wallet_client.h', - '../components/autofill/browser/wallet/wallet_client_delegate.h', - '../components/autofill/browser/wallet/wallet_items.cc', - '../components/autofill/browser/wallet/wallet_items.h', - '../components/autofill/browser/wallet/wallet_service_url.cc', - '../components/autofill/browser/wallet/wallet_service_url.h', - '../components/autofill/browser/wallet/wallet_signin_helper.cc', - '../components/autofill/browser/wallet/wallet_signin_helper.h', - # These files are generated by GRIT. '<(grit_out_dir)/grit/component_extension_resources_map.cc', '<(grit_out_dir)/grit/devtools_discovery_page_resources_map.cc', '<(grit_out_dir)/grit/theme_resources_map.cc', '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/grit/ui_resources_map.cc', - - # This file is generated by the autofill_regexes action. - '<(SHARED_INTERMEDIATE_DIR)/autofill_regex_constants.cc', ], 'conditions': [ ['OS != "ios"', { @@ -2263,8 +2153,7 @@ 'installer_util', 'sync_file_system_proto', '../cc/cc.gyp:cc', - '../components/components.gyp:autofill_regexes', - '../components/components.gyp:autofill_risk_proto', + '../components/components.gyp:autofill_browser', '../components/components.gyp:navigation_interception', '../net/net.gyp:net_with_v8', '../printing/printing.gyp:printing', diff --git a/chrome/chrome_renderer.gypi b/chrome/chrome_renderer.gypi index 3cfd769..505d085 100644 --- a/chrome/chrome_renderer.gypi +++ b/chrome/chrome_renderer.gypi @@ -13,6 +13,7 @@ 'common_net', 'chrome_resources.gyp:chrome_resources', 'chrome_resources.gyp:chrome_strings', + '../components/components.gyp:autofill_renderer', '../components/components.gyp:visitedlink_renderer', '../content/content.gyp:content_renderer', '../net/net.gyp:net', @@ -301,22 +302,6 @@ 'renderer/translate_helper.h', 'renderer/webview_color_overlay.cc', 'renderer/webview_color_overlay.h', - - # TODO(joi): Move to components/autofill.gypi once last - # remaining dependencies are broken. - '../components/autofill/renderer/autofill_agent.cc', - '../components/autofill/renderer/autofill_agent.h', - '../components/autofill/renderer/form_autofill_util.cc', - '../components/autofill/renderer/form_autofill_util.h', - '../components/autofill/renderer/form_cache.cc', - '../components/autofill/renderer/form_cache.h', - '../components/autofill/renderer/page_click_listener.h', - '../components/autofill/renderer/page_click_tracker.cc', - '../components/autofill/renderer/page_click_tracker.h', - '../components/autofill/renderer/password_autofill_manager.cc', - '../components/autofill/renderer/password_autofill_manager.h', - '../components/autofill/renderer/password_generation_manager.cc', - '../components/autofill/renderer/password_generation_manager.h', ], 'conditions': [ ['disable_nacl!=1', { @@ -368,11 +353,11 @@ '../sandbox/sandbox.gyp:sandbox', ], }], - ['enable_automation==0', { - 'sources/': [ + ['enable_automation==0', { + 'sources/': [ ['exclude', '^renderer/automation/'] - ] - }], + ] + }], ['OS=="android"', { 'sources!': [ 'renderer/prerender/prerender_webmediaplayer.cc', diff --git a/components/OWNERS b/components/OWNERS index 8068fef..fd5cd1a 100644 --- a/components/OWNERS +++ b/components/OWNERS @@ -1,5 +1,9 @@ joi@chromium.org +per-file autofill.gypi=dhollowa@chromium.org +per-file autofill.gypi=isherman@chromium.org +per-file autofill.gypi=kaiwang@chromium.org + per-file tracing*=jbauman@chromium.org per-file tracing*=nduca@chromium.org diff --git a/components/autofill.gypi b/components/autofill.gypi index 7c7be31..08442aa 100644 --- a/components/autofill.gypi +++ b/components/autofill.gypi @@ -92,6 +92,183 @@ 'autofill/common/web_element_descriptor.h', ], }, + + { + 'target_name': 'autofill_browser', + 'type': 'static_library', + 'include_dirs': [ + '..', + ], + 'dependencies': [ + 'autofill_common', + 'autofill_regexes', + 'autofill_risk_proto', + '../base/base.gyp:base', + '../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', + '../webkit/support/webkit_support.gyp:webkit_resources', + + # 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', + 'autofill/browser/autocheckout/whitelist_manager.h', + 'autofill/browser/autocheckout_manager.cc', + 'autofill/browser/autocheckout_manager.h', + 'autofill/browser/autocheckout_page_meta_data.cc', + 'autofill/browser/autocheckout_page_meta_data.h', + 'autofill/browser/autocheckout_request_manager.cc', + 'autofill/browser/autocheckout_request_manager.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_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', + '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/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', + 'autofill/browser/wallet/encryption_escrow_client.h', + 'autofill/browser/wallet/encryption_escrow_client_observer.h', + 'autofill/browser/wallet/full_wallet.cc', + 'autofill/browser/wallet/full_wallet.h', + 'autofill/browser/wallet/instrument.cc', + 'autofill/browser/wallet/instrument.h', + 'autofill/browser/wallet/required_action.cc', + 'autofill/browser/wallet/required_action.h', + 'autofill/browser/wallet/wallet_address.cc', + 'autofill/browser/wallet/wallet_address.h', + 'autofill/browser/wallet/wallet_client.cc', + 'autofill/browser/wallet/wallet_client.h', + 'autofill/browser/wallet/wallet_client_delegate.h', + 'autofill/browser/wallet/wallet_items.cc', + 'autofill/browser/wallet/wallet_items.h', + 'autofill/browser/wallet/wallet_service_url.cc', + 'autofill/browser/wallet/wallet_service_url.h', + 'autofill/browser/wallet/wallet_signin_helper.cc', + 'autofill/browser/wallet/wallet_signin_helper.h', + + # This file is generated by the autofill_regexes action. + '<(SHARED_INTERMEDIATE_DIR)/autofill_regex_constants.cc', + ], + + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. + 'msvs_disabled_warnings': [4267, ], + }, + + { + 'target_name': 'autofill_renderer', + 'type': 'static_library', + 'include_dirs': [ + '..', + ], + 'dependencies': [ + 'autofill_common', + '../base/base.gyp:base', + '../content/content.gyp:content_renderer', + '../content/content.gyp:content_common', + '../ipc/ipc.gyp:ipc', + '../skia/skia.gyp:skia', + + # TODO(kaiwang): Remove this dependency on chrome. + '../chrome/chrome_resources.gyp:chrome_strings', + ], + 'sources': [ + 'autofill/renderer/autofill_agent.cc', + 'autofill/renderer/autofill_agent.h', + 'autofill/renderer/form_autofill_util.cc', + 'autofill/renderer/form_autofill_util.h', + 'autofill/renderer/form_cache.cc', + 'autofill/renderer/form_cache.h', + 'autofill/renderer/page_click_listener.h', + 'autofill/renderer/page_click_tracker.cc', + 'autofill/renderer/page_click_tracker.h', + 'autofill/renderer/password_autofill_manager.cc', + 'autofill/renderer/password_autofill_manager.h', + 'autofill/renderer/password_generation_manager.cc', + 'autofill/renderer/password_generation_manager.h', + ], + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. + 'msvs_disabled_warnings': [4267, ], + }, ], }], ['OS == "android"', { |