Componentize autofill dialog common code

chrome/chrome_browser_ui.gypi

 # Copyright 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': {
     # There are two sections of sources:
     # * "Platform"-based sources (OS, toolkit, etc.)
     # * Feature/directory-based sources (e.g., history, printing)
 
@@ skipping 56 matching lines @@
       'browser/ui/android/window_android_helper.cc',
       'browser/ui/android/window_android_helper.h',
       'browser/ui/app_list/app_list_util.cc',
       'browser/ui/app_list/app_list_util.h',
       # All other browser/ui/app_list files go in chrome_browser_ui_app_list_sources.
       'browser/ui/app_modal/chrome_javascript_native_dialog_factory.h',
       'browser/ui/autofill/autofill_dialog_controller.cc',
       'browser/ui/autofill/autofill_dialog_controller.h',
       'browser/ui/autofill/autofill_dialog_models.cc',
       'browser/ui/autofill/autofill_dialog_models.h',
-      'browser/ui/autofill/autofill_dialog_types.cc',
-      'browser/ui/autofill/autofill_dialog_types.h',
       'browser/ui/autofill/autofill_popup_controller.h',
       'browser/ui/autofill/autofill_popup_controller_impl.cc',
       'browser/ui/autofill/autofill_popup_controller_impl.h',
       'browser/ui/autofill/autofill_popup_view.h',
       'browser/ui/autofill/autofill_popup_view_delegate.h',
       'browser/ui/autofill/card_unmask_prompt_controller.h',
       'browser/ui/autofill/card_unmask_prompt_controller_impl.cc',
       'browser/ui/autofill/card_unmask_prompt_controller_impl.h',
       'browser/ui/autofill/card_unmask_prompt_view.h',
       'browser/ui/autofill/chrome_autofill_client.cc',
@@ skipping 1119 matching lines @@
       'browser/ui/ash/multi_user/multi_user_warning_dialog.cc',
       'browser/ui/ash/multi_user/multi_user_warning_dialog.h',
       'browser/ui/ash/multi_user/multi_user_window_manager.cc',
       'browser/ui/ash/multi_user/multi_user_window_manager.h',
       'browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc',
       'browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h',
       'browser/ui/ash/multi_user/multi_user_window_manager_stub.cc',
       'browser/ui/ash/multi_user/multi_user_window_manager_stub.h',
       'browser/ui/ash/multi_user/user_switch_animator_chromeos.cc',
       'browser/ui/ash/multi_user/user_switch_animator_chromeos.h',
+      'browser/ui/ash/network_connect_delegate_chromeos.cc',
+      'browser/ui/ash/network_connect_delegate_chromeos.h',
       'browser/ui/ash/networking_config_delegate_chromeos.cc',
       'browser/ui/ash/networking_config_delegate_chromeos.h',
-      'browser/ui/ash/network_connect_delegate_chromeos.cc',
-      'browser/ui/ash/network_connect_delegate_chromeos.h',
       'browser/ui/ash/session_state_delegate_chromeos.cc',
       'browser/ui/ash/session_state_delegate_chromeos.h',
       'browser/ui/ash/solid_color_user_wallpaper_delegate.cc',
       'browser/ui/ash/solid_color_user_wallpaper_delegate.h',
       'browser/ui/ash/system_tray_delegate_chromeos.cc',
       'browser/ui/ash/system_tray_delegate_chromeos.h',
       'browser/ui/ash/system_tray_delegate_common.cc',
       'browser/ui/ash/system_tray_delegate_common.h',
       'browser/ui/ash/system_tray_delegate_utils.cc',
       'browser/ui/ash/system_tray_delegate_utils.h',
@@ skipping 1224 matching lines @@
       'browser/ui/views/app_list/win/app_list_win.h',
       'browser/ui/webui/app_list/start_page_handler.cc',
       'browser/ui/webui/app_list/start_page_handler.h',
       'browser/ui/webui/app_list/start_page_ui.cc',
       'browser/ui/webui/app_list/start_page_ui.h',
     ],
     # Used when the app list is disabled.
     'chrome_browser_ui_non_app_list_sources': [
       'browser/ui/app_list/app_list_service_disabled.cc',
     ],
-    # Autofill sources used everywhere autofill dialog is enabled.
-    'chrome_browser_ui_autofill_dialog_sources': [
-      'browser/ui/autofill/autofill_dialog_common.cc',
-      'browser/ui/autofill/autofill_dialog_common.h',
-    ],
     # Autofill sources used on desktop and ChromeOS.
     'chrome_browser_ui_autofill_dialog_non_mobile_sources': [
       'browser/ui/autofill/autofill_dialog_controller_impl.cc',
       'browser/ui/autofill/autofill_dialog_controller_impl.h',
       'browser/ui/autofill/autofill_dialog_i18n_input.cc',
       'browser/ui/autofill/autofill_dialog_i18n_input.h',
       'browser/ui/autofill/autofill_dialog_view.cc',
       'browser/ui/autofill/autofill_dialog_view.h',
       'browser/ui/autofill/autofill_dialog_view_delegate.h',
       'browser/ui/autofill/data_model_wrapper.cc',
@@ skipping 178 matching lines @@
         'cert_logger_proto',
         'chrome_browser_ui_views.gyp:browser_ui_views',
         'chrome_resources.gyp:chrome_extra_resources',
         'chrome_resources.gyp:chrome_resources',
         'chrome_resources.gyp:chrome_strings',
         'chrome_resources.gyp:platform_locale_settings',
         'chrome_resources.gyp:theme_resources',
         'common',
         'common_net',
         '../components/components.gyp:auto_login_parser',
+        '../components/components.gyp:autofill_core_browser',
         '../components/components.gyp:device_event_log_component',
         '../components/components.gyp:dom_distiller_core',
         '../components/components.gyp:dom_distiller_webui',
         '../components/components.gyp:feedback_proto',
         '../components/components.gyp:history_core_browser_proto',
         '../components/components.gyp:invalidation',
         '../components/components.gyp:onc_component',
         '../components/components.gyp:password_manager_core_browser',
         '../components/components.gyp:ui_zoom',
         '../components/components.gyp:update_client',
@@ skipping 401 matching lines @@
           ],
         }],
         ['enable_app_list==1', {
           'sources': [ '<@(chrome_browser_ui_app_list_sources)' ],
           'dependencies': [
             '../ui/app_list/app_list.gyp:app_list',
           ],
         }, {
           'sources': [ '<@(chrome_browser_ui_non_app_list_sources)' ],
         }],
-        ['enable_autofill_dialog==1', {
-          'sources': [ '<@(chrome_browser_ui_autofill_dialog_sources)' ],
-          'conditions': [
-            ['OS!="android" and OS!="ios"', {
-              'sources': [
-                '<@(chrome_browser_ui_autofill_dialog_non_mobile_sources)',
-              ],
-              'dependencies': [
-                '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput',
-                '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput_strings',
-              ],
-            }],
+        ['enable_autofill_dialog==1 and OS!="android" and OS!="ios"', {
+          'sources': [
+            '<@(chrome_browser_ui_autofill_dialog_non_mobile_sources)',
+          ],
+          'dependencies': [
+            '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput',
+            '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput_strings',
           ],
         }],
         ['enable_extensions==1', {
           'dependencies': [
             'browser_extensions',
             'browser/extensions/api/api_registration.gyp:chrome_api_registration',
             'common/extensions/api/api.gyp:chrome_api',
           ],
           'sources': [ '<@(chrome_browser_ui_extensions_sources)' ],
         }],
@@ skipping 38 matching lines @@
           ],
           'sources': [
             '<@(chrome_browser_ui_non_mobile_sources)',
             '<@(chrome_browser_ui_omnibox_non_mobile_sources)',
           ],
         }],
       ],
     },
   ],
 }