diff options
| author | satorux <satorux@chromium.org> | 2015-02-11 20:02:04 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-02-12 04:02:42 +0000 |
| commit | fb19c782220e3d5ad1174d1175fdb01928296264 (patch) | |
| tree | 6f395b9e6c5be44322cec52907a3e6b32af4dd1f | |
| parent | 8ea0e760a643b453a61bae0767fecac8624b0c4e (diff) | |
| download | chromium_src-fb19c782220e3d5ad1174d1175fdb01928296264.zip chromium_src-fb19c782220e3d5ad1174d1175fdb01928296264.tar.gz chromium_src-fb19c782220e3d5ad1174d1175fdb01928296264.tar.bz2 | |
Sort GYP files under chrome using tools/sort_sources.py
For tools/sort_sources.py to be useful, existing GYP files
should be sorted.
Also fix a bug in sort_sources.py where .mm and .rc files weren't
sorted correctly.
BUG=456014
TEST=everything should build as before
Review URL: https://codereview.chromium.org/911043002
Cr-Commit-Position: refs/heads/master@{#315927}
| -rw-r--r-- | chrome/chrome.gyp | 2 | ||||
| -rw-r--r-- | chrome/chrome_browser.gypi | 148 | ||||
| -rw-r--r-- | chrome/chrome_browser_extensions.gypi | 12 | ||||
| -rw-r--r-- | chrome/chrome_browser_ui.gypi | 136 | ||||
| -rw-r--r-- | chrome/chrome_common.gypi | 18 | ||||
| -rw-r--r-- | chrome/chrome_dll.gypi | 4 | ||||
| -rw-r--r-- | chrome/chrome_exe.gypi | 8 | ||||
| -rw-r--r-- | chrome/chrome_installer.gypi | 6 | ||||
| -rw-r--r-- | chrome/chrome_installer_util.gypi | 6 | ||||
| -rw-r--r-- | chrome/chrome_nibs.gyp | 24 | ||||
| -rw-r--r-- | chrome/chrome_renderer.gypi | 38 | ||||
| -rw-r--r-- | chrome/chrome_tests.gypi | 116 | ||||
| -rw-r--r-- | chrome/chrome_tests_unit.gypi | 76 | ||||
| -rw-r--r-- | chrome/chrome_utility.gypi | 4 | ||||
| -rwxr-xr-x | tools/sort_sources.py | 6 |
15 files changed, 302 insertions, 302 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index b2d16152..db6d7cc 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -568,8 +568,8 @@ '..', ], 'sources': [ - 'tools/crash_service/main.cc', '../content/public/common/content_switches.cc', + 'tools/crash_service/main.cc', ], 'defines': [ 'COMPILE_CONTENT_STATICALLY', diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index f1a7939..83a49a8 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -53,11 +53,11 @@ 'browser/android/chromium_application.h', 'browser/android/compositor/decoration_title.cc', 'browser/android/compositor/decoration_title.h', - 'browser/android/compositor/layer/layer.h', 'browser/android/compositor/layer/content_layer.cc', 'browser/android/compositor/layer/content_layer.h', 'browser/android/compositor/layer/contextual_search_layer.cc', 'browser/android/compositor/layer/contextual_search_layer.h', + 'browser/android/compositor/layer/layer.h', 'browser/android/compositor/layer/tab_layer.cc', 'browser/android/compositor/layer/tab_layer.h', 'browser/android/compositor/layer/thumbnail_layer.cc', @@ -76,16 +76,14 @@ 'browser/android/content_view_util.h', 'browser/android/cookies/cookies_fetcher.cc', 'browser/android/cookies/cookies_fetcher.h', - 'browser/android/dev_tools_server.cc', - 'browser/android/dev_tools_server.h', 'browser/android/dev_tools_manager_delegate_android.cc', 'browser/android/dev_tools_manager_delegate_android.h', + 'browser/android/dev_tools_server.cc', + 'browser/android/dev_tools_server.h', 'browser/android/dom_distiller/feedback_reporter_android.cc', 'browser/android/dom_distiller/feedback_reporter_android.h', 'browser/android/download/chrome_download_delegate.cc', 'browser/android/download/chrome_download_delegate.h', - 'browser/enhanced_bookmarks/android/enhanced_bookmarks_bridge.cc', - 'browser/enhanced_bookmarks/android/enhanced_bookmarks_bridge.h', 'browser/android/favicon_helper.cc', 'browser/android/favicon_helper.h', 'browser/android/feature_utilities.cc', @@ -94,14 +92,6 @@ 'browser/android/find_in_page/find_in_page_bridge.h', 'browser/android/foreign_session_helper.cc', 'browser/android/foreign_session_helper.h', - 'browser/android/logo_bridge.cc', - 'browser/android/logo_bridge.h', - 'browser/android/logo_service.cc', - 'browser/android/logo_service.h', - 'browser/android/new_tab_page_prefs.cc', - 'browser/android/new_tab_page_prefs.h', - 'browser/android/new_tab_page_url_handler.cc', - 'browser/android/new_tab_page_url_handler.h', 'browser/android/intent_helper.cc', 'browser/android/intent_helper.h', 'browser/android/intercept_download_resource_throttle.cc', @@ -109,10 +99,18 @@ 'browser/android/location_settings.h', 'browser/android/location_settings_impl.cc', 'browser/android/location_settings_impl.h', + 'browser/android/logo_bridge.cc', + 'browser/android/logo_bridge.h', + 'browser/android/logo_service.cc', + 'browser/android/logo_service.h', 'browser/android/manifest_icon_selector.cc', 'browser/android/manifest_icon_selector.h', 'browser/android/most_visited_sites.cc', 'browser/android/most_visited_sites.h', + 'browser/android/new_tab_page_prefs.cc', + 'browser/android/new_tab_page_prefs.h', + 'browser/android/new_tab_page_url_handler.cc', + 'browser/android/new_tab_page_url_handler.h', 'browser/android/omnibox/answers_image_bridge.cc', 'browser/android/omnibox/answers_image_bridge.h', 'browser/android/omnibox/autocomplete_controller_android.cc', @@ -138,9 +136,9 @@ 'browser/android/provider/run_on_ui_thread_blocking.h', 'browser/android/recently_closed_tabs_bridge.cc', 'browser/android/recently_closed_tabs_bridge.h', + 'browser/android/resource_id.h', 'browser/android/resource_mapper.cc', 'browser/android/resource_mapper.h', - 'browser/android/resource_id.h', 'browser/android/service_tab_launcher.cc', 'browser/android/service_tab_launcher.h', 'browser/android/shortcut_helper.cc', @@ -176,12 +174,6 @@ 'browser/app_icon_win.h', 'browser/app_mode/app_mode_utils.cc', 'browser/app_mode/app_mode_utils.h', - 'browser/banners/app_banner_settings_helper.cc', - 'browser/banners/app_banner_settings_helper.h', - 'browser/bitmap_fetcher/bitmap_fetcher_service.cc', - 'browser/bitmap_fetcher/bitmap_fetcher_service.h', - 'browser/bitmap_fetcher/bitmap_fetcher_service_factory.cc', - 'browser/bitmap_fetcher/bitmap_fetcher_service_factory.h', 'browser/autofill/android/personal_data_manager_android.cc', 'browser/autofill/android/personal_data_manager_android.h', 'browser/autofill/personal_data_manager_factory.cc', @@ -190,9 +182,15 @@ 'browser/autofill/risk_util.h', 'browser/autofill/validation_rules_storage_factory.cc', 'browser/autofill/validation_rules_storage_factory.h', + 'browser/banners/app_banner_settings_helper.cc', + 'browser/banners/app_banner_settings_helper.h', 'browser/bitmap_fetcher/bitmap_fetcher.cc', 'browser/bitmap_fetcher/bitmap_fetcher.h', 'browser/bitmap_fetcher/bitmap_fetcher_delegate.h', + 'browser/bitmap_fetcher/bitmap_fetcher_service.cc', + 'browser/bitmap_fetcher/bitmap_fetcher_service.h', + 'browser/bitmap_fetcher/bitmap_fetcher_service_factory.cc', + 'browser/bitmap_fetcher/bitmap_fetcher_service_factory.h', 'browser/browser_about_handler.cc', 'browser/browser_about_handler.h', 'browser/browser_shutdown.cc', @@ -215,14 +213,14 @@ 'browser/browsing_data/browsing_data_indexed_db_helper.h', 'browser/browsing_data/browsing_data_local_storage_helper.cc', 'browser/browsing_data/browsing_data_local_storage_helper.h', - 'browser/browsing_data/browsing_data_service_worker_helper.cc', - 'browser/browsing_data/browsing_data_service_worker_helper.h', 'browser/browsing_data/browsing_data_quota_helper.cc', 'browser/browsing_data/browsing_data_quota_helper.h', 'browser/browsing_data/browsing_data_quota_helper_impl.cc', 'browser/browsing_data/browsing_data_quota_helper_impl.h', 'browser/browsing_data/browsing_data_remover.cc', 'browser/browsing_data/browsing_data_remover.h', + 'browser/browsing_data/browsing_data_service_worker_helper.cc', + 'browser/browsing_data/browsing_data_service_worker_helper.h', 'browser/browsing_data/canonical_cookie_hash.cc', 'browser/browsing_data/canonical_cookie_hash.h', 'browser/browsing_data/cookies_tree_model.cc', @@ -231,8 +229,6 @@ 'browser/browsing_data/local_data_container.h', 'browser/character_encoding.cc', 'browser/character_encoding.h', - 'browser/chrome_net_benchmarking_message_filter.cc', - 'browser/chrome_net_benchmarking_message_filter.h', 'browser/chrome_browser_application_mac.h', 'browser/chrome_browser_application_mac.mm', 'browser/chrome_browser_field_trials.cc', @@ -253,11 +249,13 @@ 'browser/chrome_content_browser_client_parts.h', 'browser/chrome_elf_init_win.cc', 'browser/chrome_elf_init_win.h', + 'browser/chrome_net_benchmarking_message_filter.cc', + 'browser/chrome_net_benchmarking_message_filter.h', 'browser/chrome_notification_types.h', - 'browser/chrome_select_file_dialog_factory_win.cc', - 'browser/chrome_select_file_dialog_factory_win.h', 'browser/chrome_quota_permission_context.cc', 'browser/chrome_quota_permission_context.h', + 'browser/chrome_select_file_dialog_factory_win.cc', + 'browser/chrome_select_file_dialog_factory_win.h', 'browser/command_observer.h', 'browser/command_updater.cc', 'browser/command_updater.h', @@ -357,6 +355,8 @@ 'browser/download/drag_download_item.h', 'browser/download/save_package_file_picker.cc', 'browser/download/save_package_file_picker.h', + 'browser/enhanced_bookmarks/android/enhanced_bookmarks_bridge.cc', + 'browser/enhanced_bookmarks/android/enhanced_bookmarks_bridge.h', 'browser/enumerate_modules_model_win.cc', 'browser/enumerate_modules_model_win.h', # Oh hey, all the cool browser/extensions files are hanging out in @@ -428,10 +428,10 @@ 'browser/install_verification/win/module_verification_common.h', 'browser/internal_auth.cc', 'browser/internal_auth.h', - 'browser/interstitials/security_interstitial_page.cc', - 'browser/interstitials/security_interstitial_page.h', 'browser/interstitials/security_interstitial_metrics_helper.cc', 'browser/interstitials/security_interstitial_metrics_helper.h', + 'browser/interstitials/security_interstitial_page.cc', + 'browser/interstitials/security_interstitial_page.h', 'browser/intranet_redirect_detector.cc', 'browser/intranet_redirect_detector.h', 'browser/invalidation/invalidation_service_factory_android.cc', @@ -450,10 +450,10 @@ 'browser/lifetime/application_lifetime_android.h', 'browser/lifetime/application_lifetime_mac.mm', 'browser/lifetime/application_lifetime_win.cc', - 'browser/mac/dock.h', - 'browser/mac/dock.mm', 'browser/mac/bluetooth_utility.h', 'browser/mac/bluetooth_utility.mm', + 'browser/mac/dock.h', + 'browser/mac/dock.mm', 'browser/mac/install_from_dmg.h', 'browser/mac/install_from_dmg.mm', 'browser/mac/keystone_glue.h', @@ -525,12 +525,12 @@ 'browser/prefetch/prefetch_field_trial.h', 'browser/prerender/external_prerender_handler_android.cc', 'browser/prerender/external_prerender_handler_android.h', - 'browser/prerender/prerender_cookie_store.cc', - 'browser/prerender/prerender_cookie_store.h', 'browser/prerender/prerender_config.cc', 'browser/prerender/prerender_config.h', 'browser/prerender/prerender_contents.cc', 'browser/prerender/prerender_contents.h', + 'browser/prerender/prerender_cookie_store.cc', + 'browser/prerender/prerender_cookie_store.h', 'browser/prerender/prerender_field_trial.cc', 'browser/prerender/prerender_field_trial.h', 'browser/prerender/prerender_final_status.cc', @@ -606,7 +606,6 @@ 'browser/search/instant_service_observer.cc', 'browser/search/instant_service_observer.h', 'browser/search/most_visited_iframe_source.cc', - 'browser/searuch/most_visited_iframe_source.h', 'browser/search/search.cc', 'browser/search/search.h', 'browser/search/suggestions/image_fetcher_impl.cc', @@ -615,6 +614,7 @@ 'browser/search/suggestions/suggestions_service_factory.h', 'browser/search/suggestions/suggestions_source.cc', 'browser/search/suggestions/suggestions_source.h', + 'browser/searuch/most_visited_iframe_source.h', 'browser/shell_integration.cc', 'browser/shell_integration.h', 'browser/shell_integration_android.cc', @@ -632,10 +632,10 @@ 'browser/speech/tts_controller_impl.cc', 'browser/speech/tts_controller_impl.h', 'browser/speech/tts_mac.mm', - 'browser/speech/tts_platform.cc', - 'browser/speech/tts_platform.h', 'browser/speech/tts_message_filter.cc', 'browser/speech/tts_message_filter.h', + 'browser/speech/tts_platform.cc', + 'browser/speech/tts_platform.h', 'browser/speech/tts_win.cc', 'browser/status_icons/status_icon.cc', 'browser/status_icons/status_icon.h', @@ -690,8 +690,16 @@ 'browser/webdata/web_data_service_factory.h', ], 'chrome_browser_android_sources': [ + 'browser/media/protected_media_identifier_infobar_delegate.cc', + 'browser/media/protected_media_identifier_infobar_delegate.h', + 'browser/media/protected_media_identifier_permission_context.cc', + 'browser/media/protected_media_identifier_permission_context.h', + 'browser/media/protected_media_identifier_permission_context_factory.cc', + 'browser/media/protected_media_identifier_permission_context_factory.h', 'browser/metrics/android_metrics_provider.cc', 'browser/metrics/android_metrics_provider.h', + 'browser/password_manager/generated_password_saved_infobar_delegate_android.cc', + 'browser/password_manager/generated_password_saved_infobar_delegate_android.h', 'browser/sessions/in_memory_tab_restore_service.cc', 'browser/sessions/in_memory_tab_restore_service.h', 'browser/signin/android_profile_oauth2_token_service.cc', @@ -699,14 +707,6 @@ 'browser/ssl/ssl_add_certificate_android.cc', 'browser/web_resource/notification_promo_mobile_ntp.cc', 'browser/web_resource/notification_promo_mobile_ntp.h', - 'browser/media/protected_media_identifier_infobar_delegate.cc', - 'browser/media/protected_media_identifier_infobar_delegate.h', - 'browser/media/protected_media_identifier_permission_context.cc', - 'browser/media/protected_media_identifier_permission_context.h', - 'browser/media/protected_media_identifier_permission_context_factory.cc', - 'browser/media/protected_media_identifier_permission_context_factory.h', - 'browser/password_manager/generated_password_saved_infobar_delegate_android.cc', - 'browser/password_manager/generated_password_saved_infobar_delegate_android.h', ], # Cross-platform Ash sources. 'chrome_browser_ash_sources': [ @@ -757,10 +757,10 @@ ], # Everything but Android, iOS, and CrOS. 'chrome_browser_desktop_sources': [ - 'browser/profiles/avatar_menu_desktop.cc', - 'browser/profiles/avatar_menu_observer.h', 'browser/profiles/avatar_menu_actions_desktop.cc', 'browser/profiles/avatar_menu_actions_desktop.h', + 'browser/profiles/avatar_menu_desktop.cc', + 'browser/profiles/avatar_menu_observer.h', 'browser/profiles/profile_list_desktop.cc', 'browser/profiles/profile_list_desktop.h', ], @@ -1105,10 +1105,10 @@ ], # Sources (generally "desktop OS importers") used only on Mac & Windows. 'chrome_browser_win_mac_sources': [ - 'browser/media_galleries/fileapi/iapps_data_provider.cc', - 'browser/media_galleries/fileapi/iapps_data_provider.h', 'browser/media_galleries/fileapi/file_path_watcher_util.cc', 'browser/media_galleries/fileapi/file_path_watcher_util.h', + 'browser/media_galleries/fileapi/iapps_data_provider.cc', + 'browser/media_galleries/fileapi/iapps_data_provider.h', 'browser/media_galleries/fileapi/itunes_data_provider.cc', 'browser/media_galleries/fileapi/itunes_data_provider.h', 'browser/media_galleries/fileapi/itunes_file_util.cc', @@ -1270,13 +1270,13 @@ 'browser/autocomplete/keyword_extensions_delegate_impl.h', 'browser/content_settings/content_settings_internal_extension_provider.cc', 'browser/content_settings/content_settings_internal_extension_provider.h', - 'browser/drive/drive_app_registry.cc', - 'browser/drive/drive_app_registry.h', - 'browser/drive/drive_app_registry_observer.h', 'browser/drive/drive_api_service.cc', 'browser/drive/drive_api_service.h', 'browser/drive/drive_api_util.cc', 'browser/drive/drive_api_util.h', + 'browser/drive/drive_app_registry.cc', + 'browser/drive/drive_app_registry.h', + 'browser/drive/drive_app_registry_observer.h', 'browser/drive/drive_notification_manager.cc', 'browser/drive/drive_notification_manager.h', 'browser/drive/drive_notification_manager_factory.cc', @@ -1682,10 +1682,10 @@ 'browser/metrics/perf_provider_chromeos.h', 'browser/metrics/rappor/sampling.cc', 'browser/metrics/rappor/sampling.h', - 'browser/metrics/signin_status_metrics_provider_base.cc', - 'browser/metrics/signin_status_metrics_provider_base.h', 'browser/metrics/signin_status_metrics_provider.cc', 'browser/metrics/signin_status_metrics_provider.h', + 'browser/metrics/signin_status_metrics_provider_base.cc', + 'browser/metrics/signin_status_metrics_provider_base.h', 'browser/metrics/signin_status_metrics_provider_chromeos.cc', 'browser/metrics/signin_status_metrics_provider_chromeos.h', 'browser/metrics/thread_watcher.cc', @@ -1844,8 +1844,8 @@ 'browser/notifications/message_center_settings_controller.h', 'browser/notifications/message_center_stats_collector.cc', 'browser/notifications/message_center_stats_collector.h', - 'browser/notifications/notification_conversion_helper.h', 'browser/notifications/notification_conversion_helper.cc', + 'browser/notifications/notification_conversion_helper.h', 'browser/notifications/notification_system_observer.cc', 'browser/notifications/notification_system_observer.h', 'browser/notifications/notification_ui_manager_desktop.cc', @@ -1910,10 +1910,10 @@ 'browser/plugins/plugin_data_remover_helper.h', 'browser/plugins/plugin_finder.cc', 'browser/plugins/plugin_finder.h', - 'browser/plugins/plugin_infobar_delegates.cc', - 'browser/plugins/plugin_infobar_delegates.h', 'browser/plugins/plugin_info_message_filter.cc', 'browser/plugins/plugin_info_message_filter.h', + 'browser/plugins/plugin_infobar_delegates.cc', + 'browser/plugins/plugin_infobar_delegates.h', 'browser/plugins/plugin_metadata.cc', 'browser/plugins/plugin_metadata.h', 'browser/plugins/plugin_observer.cc', @@ -1926,8 +1926,8 @@ 'browser/plugins/plugin_status_pref_setter.h', 'browser/renderer_host/pepper/chrome_browser_pepper_host_factory.cc', 'browser/renderer_host/pepper/chrome_browser_pepper_host_factory.h', - 'browser/renderer_host/pepper/device_id_fetcher.h', 'browser/renderer_host/pepper/device_id_fetcher.cc', + 'browser/renderer_host/pepper/device_id_fetcher.h', 'browser/renderer_host/pepper/monitor_finder_mac.h', 'browser/renderer_host/pepper/monitor_finder_mac.mm', 'browser/renderer_host/pepper/pepper_broker_message_filter.cc', @@ -1956,10 +1956,10 @@ # Files to compile when configuration policy is disabled. Note that the # connector factory is also used when policy is enabled. 'chrome_browser_policy_disabled_sources': [ - 'browser/policy/profile_policy_connector_stub.cc', 'browser/policy/profile_policy_connector.h', 'browser/policy/profile_policy_connector_factory.cc', 'browser/policy/profile_policy_connector_factory.h', + 'browser/policy/profile_policy_connector_stub.cc', ], # Files to use when configuration policy is enabled that are also shared # with iOS. Non-iOS policy files are below. @@ -1968,12 +1968,12 @@ 'browser/net/proxy_policy_handler.h', 'browser/policy/cloud/cloud_policy_invalidator.cc', 'browser/policy/cloud/cloud_policy_invalidator.h', - 'browser/policy/cloud/policy_header_service_factory.h', 'browser/policy/cloud/policy_header_service_factory.cc', - 'browser/policy/cloud/user_cloud_policy_invalidator_factory.cc', - 'browser/policy/cloud/user_cloud_policy_invalidator_factory.h', + 'browser/policy/cloud/policy_header_service_factory.h', 'browser/policy/cloud/user_cloud_policy_invalidator.cc', 'browser/policy/cloud/user_cloud_policy_invalidator.h', + 'browser/policy/cloud/user_cloud_policy_invalidator_factory.cc', + 'browser/policy/cloud/user_cloud_policy_invalidator_factory.h', 'browser/policy/configuration_policy_handler_list_factory.cc', 'browser/policy/configuration_policy_handler_list_factory.h', 'browser/policy/managed_bookmarks_policy_handler.cc', @@ -2094,8 +2094,8 @@ 'browser/prefs/synced_pref_change_registrar.cc', 'browser/prefs/synced_pref_change_registrar.h', 'browser/prefs/synced_pref_observer.h', - 'browser/prefs/tracked/device_id_win.cc', 'browser/prefs/tracked/device_id.h', + 'browser/prefs/tracked/device_id_win.cc', 'browser/prefs/tracked/dictionary_hash_store_contents.cc', 'browser/prefs/tracked/dictionary_hash_store_contents.h', 'browser/prefs/tracked/hash_store_contents.h', @@ -2159,15 +2159,11 @@ 'browser/printing/background_printing_manager.cc', 'browser/printing/background_printing_manager.h', 'browser/printing/cloud_print/cloud_print_proxy_service.cc', + 'browser/printing/cloud_print/cloud_print_proxy_service.h', 'browser/printing/cloud_print/cloud_print_proxy_service_factory.cc', 'browser/printing/cloud_print/cloud_print_proxy_service_factory.h', - 'browser/printing/cloud_print/cloud_print_proxy_service.h', 'browser/printing/print_dialog_cloud.cc', 'browser/printing/print_dialog_cloud.h', - 'browser/printing/printer_manager_dialog.h', - 'browser/printing/printer_manager_dialog_linux.cc', - 'browser/printing/printer_manager_dialog_mac.mm', - 'browser/printing/printer_manager_dialog_win.cc', 'browser/printing/print_error_dialog.cc', 'browser/printing/print_error_dialog.h', 'browser/printing/print_preview_context_menu_observer.cc', @@ -2181,6 +2177,10 @@ 'browser/printing/print_view_manager.cc', 'browser/printing/print_view_manager.h', 'browser/printing/print_view_manager_observer.h', + 'browser/printing/printer_manager_dialog.h', + 'browser/printing/printer_manager_dialog_linux.cc', + 'browser/printing/printer_manager_dialog_mac.mm', + 'browser/printing/printer_manager_dialog_win.cc', 'browser/service_process/service_process_control.cc', 'browser/service_process/service_process_control.h', 'browser/service_process/service_process_control_mac.mm', @@ -2248,21 +2248,21 @@ ], 'chrome_browser_rlz_sources': [ 'browser/rlz/rlz.cc', + 'browser/rlz/rlz.h', 'browser/rlz/rlz_chromeos.cc', 'browser/rlz/rlz_ios.mm', 'browser/rlz/rlz_mac.cc', 'browser/rlz/rlz_win.cc', - 'browser/rlz/rlz.h', ], # Used for safe browsing in basic mode (safe_browsing=2) as well as full # mode (safe_browsing=1). 'chrome_browser_safe_browsing_basic_sources': [ 'browser/renderer_host/safe_browsing_resource_throttle_factory.cc', 'browser/renderer_host/safe_browsing_resource_throttle_factory.h', - 'browser/safe_browsing/malware_details_cache.cc', - 'browser/safe_browsing/malware_details_cache.h', 'browser/safe_browsing/malware_details.cc', 'browser/safe_browsing/malware_details.h', + 'browser/safe_browsing/malware_details_cache.cc', + 'browser/safe_browsing/malware_details_cache.h', 'browser/safe_browsing/malware_details_history.cc', 'browser/safe_browsing/malware_details_history.h', 'browser/safe_browsing/ping_manager.cc', @@ -2363,9 +2363,9 @@ 'browser/safe_browsing/safe_browsing_database.cc', 'browser/safe_browsing/safe_browsing_database.h', 'browser/safe_browsing/safe_browsing_store.cc', + 'browser/safe_browsing/safe_browsing_store.h', 'browser/safe_browsing/safe_browsing_store_file.cc', 'browser/safe_browsing/safe_browsing_store_file.h', - 'browser/safe_browsing/safe_browsing_store.h', 'browser/safe_browsing/sandboxed_zip_analyzer.cc', 'browser/safe_browsing/sandboxed_zip_analyzer.h', 'browser/safe_browsing/two_phase_uploader.cc', @@ -2464,9 +2464,9 @@ 'browser/services/gcm/push_messaging_service_impl.h', ], 'chrome_browser_session_sources': [ + 'browser/sessions/base_session_service_delegate.h', 'browser/sessions/base_session_service_delegate_impl.cc', 'browser/sessions/base_session_service_delegate_impl.h', - 'browser/sessions/base_session_service_delegate.h', 'browser/sessions/session_data_deleter.cc', 'browser/sessions/session_data_deleter.h', 'browser/sessions/session_restore_android.cc', @@ -2800,18 +2800,18 @@ 'browser/themes/theme_properties.cc', 'browser/themes/theme_properties.h', 'browser/themes/theme_service.cc', + 'browser/themes/theme_service.h', 'browser/themes/theme_service_factory.cc', 'browser/themes/theme_service_factory.h', - 'browser/themes/theme_service.h', 'browser/themes/theme_service_mac.mm', 'browser/themes/theme_syncable_service.cc', 'browser/themes/theme_syncable_service.h', ], 'chrome_browser_undo_sources': [ 'browser/undo/bookmark_undo_service.cc', + 'browser/undo/bookmark_undo_service.h', 'browser/undo/bookmark_undo_service_factory.cc', 'browser/undo/bookmark_undo_service_factory.h', - 'browser/undo/bookmark_undo_service.h', 'browser/undo/bookmark_undo_utils.cc', 'browser/undo/bookmark_undo_utils.h', 'browser/undo/undo_manager.cc', @@ -3053,9 +3053,9 @@ '<@(chrome_browser_web_resource_sources)', # These files are generated by GRIT. + '<(SHARED_INTERMEDIATE_DIR)/ui/resources/grit/ui_resources_map.cc', '<(grit_out_dir)/grit/component_extension_resources_map.cc', '<(grit_out_dir)/grit/theme_resources_map.cc', - '<(SHARED_INTERMEDIATE_DIR)/ui/resources/grit/ui_resources_map.cc', # This file is generated by # chrome/browser/metrics/variations/generate_resources_map.py diff --git a/chrome/chrome_browser_extensions.gypi b/chrome/chrome_browser_extensions.gypi index b043436..45a8e3d 100644 --- a/chrome/chrome_browser_extensions.gypi +++ b/chrome/chrome_browser_extensions.gypi @@ -179,14 +179,14 @@ 'browser/extensions/api/debugger/debugger_api.h', 'browser/extensions/api/debugger/debugger_api_constants.cc', 'browser/extensions/api/debugger/debugger_api_constants.h', + 'browser/extensions/api/declarative_content/chrome_content_rules_registry.cc', + 'browser/extensions/api/declarative_content/chrome_content_rules_registry.h', 'browser/extensions/api/declarative_content/content_action.cc', 'browser/extensions/api/declarative_content/content_action.h', 'browser/extensions/api/declarative_content/content_condition.cc', 'browser/extensions/api/declarative_content/content_condition.h', 'browser/extensions/api/declarative_content/content_constants.cc', 'browser/extensions/api/declarative_content/content_constants.h', - 'browser/extensions/api/declarative_content/chrome_content_rules_registry.cc', - 'browser/extensions/api/declarative_content/chrome_content_rules_registry.h', 'browser/extensions/api/desktop_capture/desktop_capture_api.cc', 'browser/extensions/api/desktop_capture/desktop_capture_api.h', 'browser/extensions/api/developer_private/developer_private_api.cc', @@ -424,8 +424,8 @@ 'browser/extensions/api/tab_capture/tab_capture_api.h', 'browser/extensions/api/tab_capture/tab_capture_registry.cc', 'browser/extensions/api/tab_capture/tab_capture_registry.h', - 'browser/extensions/api/tabs/tabs_api.h', 'browser/extensions/api/tabs/tabs_api.cc', + 'browser/extensions/api/tabs/tabs_api.h', 'browser/extensions/api/tabs/tabs_constants.cc', 'browser/extensions/api/tabs/tabs_constants.h', 'browser/extensions/api/tabs/tabs_event_router.cc', @@ -635,10 +635,10 @@ 'browser/extensions/extension_ui_util.h', 'browser/extensions/extension_uninstall_dialog.cc', 'browser/extensions/extension_uninstall_dialog.h', - 'browser/extensions/extension_util.cc', - 'browser/extensions/extension_util.h', 'browser/extensions/extension_user_script_loader.cc', 'browser/extensions/extension_user_script_loader.h', + 'browser/extensions/extension_util.cc', + 'browser/extensions/extension_util.h', 'browser/extensions/extension_view_host.cc', 'browser/extensions/extension_view_host.h', 'browser/extensions/extension_view_host_factory.cc', @@ -802,8 +802,8 @@ 'browser/web_applications/web_app_chromeos.cc', 'browser/web_applications/web_app_mac.h', 'browser/web_applications/web_app_mac.mm', - 'browser/web_applications/web_app_win.h', 'browser/web_applications/web_app_win.cc', + 'browser/web_applications/web_app_win.h', ], 'chrome_browser_extensions_app_list_sources': [ 'browser/apps/drive/drive_app_converter.cc', diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi index 96c0403..a9ba0dd 100644 --- a/chrome/chrome_browser_ui.gypi +++ b/chrome/chrome_browser_ui.gypi @@ -25,8 +25,14 @@ 'browser/ui/android/autofill/card_unmask_prompt_view_android.h', 'browser/ui/android/autofill/password_generation_popup_view_android.cc', 'browser/ui/android/autofill/password_generation_popup_view_android.h', + 'browser/ui/android/chrome_http_auth_handler.cc', + 'browser/ui/android/chrome_http_auth_handler.h', + 'browser/ui/android/color_chooser_dialog_android.cc', 'browser/ui/android/content_settings/popup_blocked_infobar_delegate.cc', 'browser/ui/android/content_settings/popup_blocked_infobar_delegate.h', + 'browser/ui/android/context_menu_helper.cc', + 'browser/ui/android/context_menu_helper.h', + 'browser/ui/android/external_protocol_dialog_android.cc', 'browser/ui/android/infobars/app_banner_infobar.cc', 'browser/ui/android/infobars/app_banner_infobar.h', 'browser/ui/android/infobars/confirm_infobar.cc', @@ -39,12 +45,6 @@ 'browser/ui/android/infobars/infobar_container_android.h', 'browser/ui/android/infobars/translate_infobar.cc', 'browser/ui/android/infobars/translate_infobar.h', - 'browser/ui/android/chrome_http_auth_handler.cc', - 'browser/ui/android/chrome_http_auth_handler.h', - 'browser/ui/android/color_chooser_dialog_android.cc', - 'browser/ui/android/context_menu_helper.cc', - 'browser/ui/android/context_menu_helper.h', - 'browser/ui/android/external_protocol_dialog_android.cc', 'browser/ui/android/javascript_app_modal_dialog_android.cc', 'browser/ui/android/login_prompt_android.cc', 'browser/ui/android/navigation_popup.cc', @@ -93,14 +93,14 @@ 'browser/ui/autofill/country_combobox_model.h', 'browser/ui/autofill/credit_card_scanner_controller.cc', 'browser/ui/autofill/credit_card_scanner_controller.h', - 'browser/ui/autofill/credit_card_scanner_view_delegate.h', 'browser/ui/autofill/credit_card_scanner_view.cc', 'browser/ui/autofill/credit_card_scanner_view.h', + 'browser/ui/autofill/credit_card_scanner_view_delegate.h', 'browser/ui/autofill/loading_animation.cc', 'browser/ui/autofill/loading_animation.h', + 'browser/ui/autofill/password_generation_popup_controller.h', 'browser/ui/autofill/password_generation_popup_controller_impl.cc', 'browser/ui/autofill/password_generation_popup_controller_impl.h', - 'browser/ui/autofill/password_generation_popup_controller.h', 'browser/ui/autofill/password_generation_popup_observer.h', 'browser/ui/autofill/password_generation_popup_view.cc', 'browser/ui/autofill/password_generation_popup_view.h', @@ -181,13 +181,13 @@ 'browser/ui/cocoa/apps/quit_with_apps_controller_mac.h', 'browser/ui/cocoa/autofill/autofill_account_chooser.h', 'browser/ui/cocoa/autofill/autofill_account_chooser.mm', + 'browser/ui/cocoa/autofill/autofill_bubble_controller.h', + 'browser/ui/cocoa/autofill/autofill_bubble_controller.mm', 'browser/ui/cocoa/autofill/autofill_details_container.h', 'browser/ui/cocoa/autofill/autofill_details_container.mm', 'browser/ui/cocoa/autofill/autofill_dialog_cocoa.h', 'browser/ui/cocoa/autofill/autofill_dialog_cocoa.mm', 'browser/ui/cocoa/autofill/autofill_dialog_constants.h', - 'browser/ui/cocoa/autofill/autofill_bubble_controller.h', - 'browser/ui/cocoa/autofill/autofill_bubble_controller.mm', 'browser/ui/cocoa/autofill/autofill_dialog_window_controller.h', 'browser/ui/cocoa/autofill/autofill_dialog_window_controller.mm', 'browser/ui/cocoa/autofill/autofill_header.h', @@ -203,14 +203,14 @@ 'browser/ui/cocoa/autofill/autofill_notification_controller.mm', 'browser/ui/cocoa/autofill/autofill_overlay_controller.h', 'browser/ui/cocoa/autofill/autofill_overlay_controller.mm', - 'browser/ui/cocoa/autofill/autofill_popup_view_bridge.h', - 'browser/ui/cocoa/autofill/autofill_popup_view_bridge.mm', + 'browser/ui/cocoa/autofill/autofill_pop_up_button.h', + 'browser/ui/cocoa/autofill/autofill_pop_up_button.mm', 'browser/ui/cocoa/autofill/autofill_popup_base_view_cocoa.h', 'browser/ui/cocoa/autofill/autofill_popup_base_view_cocoa.mm', + 'browser/ui/cocoa/autofill/autofill_popup_view_bridge.h', + 'browser/ui/cocoa/autofill/autofill_popup_view_bridge.mm', 'browser/ui/cocoa/autofill/autofill_popup_view_cocoa.h', 'browser/ui/cocoa/autofill/autofill_popup_view_cocoa.mm', - 'browser/ui/cocoa/autofill/autofill_pop_up_button.h', - 'browser/ui/cocoa/autofill/autofill_pop_up_button.mm', 'browser/ui/cocoa/autofill/autofill_section_container.h', 'browser/ui/cocoa/autofill/autofill_section_container.mm', 'browser/ui/cocoa/autofill/autofill_section_view.h', @@ -299,13 +299,13 @@ 'browser/ui/cocoa/browser_window_cocoa.mm', 'browser/ui/cocoa/browser_window_controller.h', 'browser/ui/cocoa/browser_window_controller.mm', - 'browser/ui/cocoa/browser_window_layout.h', - 'browser/ui/cocoa/browser_window_layout.mm', 'browser/ui/cocoa/browser_window_controller_private.h', 'browser/ui/cocoa/browser_window_controller_private.mm', 'browser/ui/cocoa/browser_window_enter_fullscreen_transition.h', 'browser/ui/cocoa/browser_window_enter_fullscreen_transition.mm', 'browser/ui/cocoa/browser_window_factory_cocoa.mm', + 'browser/ui/cocoa/browser_window_layout.h', + 'browser/ui/cocoa/browser_window_layout.mm', 'browser/ui/cocoa/browser_window_utils.h', 'browser/ui/cocoa/browser_window_utils.mm', 'browser/ui/cocoa/bubble_combobox.h', @@ -395,18 +395,18 @@ 'browser/ui/cocoa/download/download_started_animation_mac.mm', 'browser/ui/cocoa/download/download_util_mac.h', 'browser/ui/cocoa/download/download_util_mac.mm', + 'browser/ui/cocoa/drag_util.h', + 'browser/ui/cocoa/drag_util.mm', 'browser/ui/cocoa/draggable_button.h', 'browser/ui/cocoa/draggable_button.mm', 'browser/ui/cocoa/draggable_button_mixin.h', 'browser/ui/cocoa/draggable_button_mixin.mm', - 'browser/ui/cocoa/drag_util.h', - 'browser/ui/cocoa/drag_util.mm', 'browser/ui/cocoa/encoding_menu_controller_delegate_mac.h', 'browser/ui/cocoa/encoding_menu_controller_delegate_mac.mm', - 'browser/ui/cocoa/exclusive_access_bubble_window_controller.h', - 'browser/ui/cocoa/exclusive_access_bubble_window_controller.mm', 'browser/ui/cocoa/exclusive_access_bubble_view.h', 'browser/ui/cocoa/exclusive_access_bubble_view.mm', + 'browser/ui/cocoa/exclusive_access_bubble_window_controller.h', + 'browser/ui/cocoa/exclusive_access_bubble_window_controller.mm', 'browser/ui/cocoa/extensions/browser_action_button.h', 'browser/ui/cocoa/extensions/browser_action_button.mm', 'browser/ui/cocoa/extensions/browser_action_test_util_mac.mm', @@ -462,10 +462,10 @@ 'browser/ui/cocoa/floating_bar_backing_view.mm', 'browser/ui/cocoa/framed_browser_window.h', 'browser/ui/cocoa/framed_browser_window.mm', - 'browser/ui/cocoa/fullscreen_window.h', - 'browser/ui/cocoa/fullscreen_window.mm', 'browser/ui/cocoa/full_size_content_window.h', 'browser/ui/cocoa/full_size_content_window.mm', + 'browser/ui/cocoa/fullscreen_window.h', + 'browser/ui/cocoa/fullscreen_window.mm', 'browser/ui/cocoa/gradient_button_cell.h', 'browser/ui/cocoa/gradient_button_cell.mm', 'browser/ui/cocoa/handoff_active_url_observer.cc', @@ -649,6 +649,8 @@ 'browser/ui/cocoa/profiles/user_manager_mac.mm', 'browser/ui/cocoa/rect_path_utils.h', 'browser/ui/cocoa/rect_path_utils.mm', + 'browser/ui/cocoa/renderer_context_menu/render_view_context_menu_mac.h', + 'browser/ui/cocoa/renderer_context_menu/render_view_context_menu_mac.mm', 'browser/ui/cocoa/restart_browser.h', 'browser/ui/cocoa/restart_browser.mm', 'browser/ui/cocoa/screen_capture_notification_ui_cocoa.h', @@ -668,8 +670,6 @@ 'browser/ui/cocoa/styled_text_field.mm', 'browser/ui/cocoa/styled_text_field_cell.h', 'browser/ui/cocoa/styled_text_field_cell.mm', - 'browser/ui/cocoa/renderer_context_menu/render_view_context_menu_mac.h', - 'browser/ui/cocoa/renderer_context_menu/render_view_context_menu_mac.mm', 'browser/ui/cocoa/tab_contents/chrome_web_contents_view_delegate_mac.h', 'browser/ui/cocoa/tab_contents/chrome_web_contents_view_delegate_mac.mm', 'browser/ui/cocoa/tab_contents/favicon_util_mac.h', @@ -783,14 +783,14 @@ 'browser/ui/login/login_prompt.h', 'browser/ui/media_utils.cc', 'browser/ui/media_utils.h', - 'browser/ui/navigation_correction_tab_observer.cc', - 'browser/ui/navigation_correction_tab_observer.h', 'browser/ui/metro_pin_tab_helper_win.cc', 'browser/ui/metro_pin_tab_helper_win.h', + 'browser/ui/navigation_correction_tab_observer.cc', + 'browser/ui/navigation_correction_tab_observer.h', 'browser/ui/passwords/account_avatar_fetcher.cc', 'browser/ui/passwords/account_avatar_fetcher.h', - 'browser/ui/passwords/account_chooser_more_combobox_model.h', 'browser/ui/passwords/account_chooser_more_combobox_model.cc', + 'browser/ui/passwords/account_chooser_more_combobox_model.h', 'browser/ui/passwords/manage_passwords_bubble.cc', 'browser/ui/passwords/manage_passwords_bubble.h', 'browser/ui/passwords/manage_passwords_bubble_model.cc', @@ -826,10 +826,10 @@ 'browser/ui/search/instant_search_prerenderer.h', 'browser/ui/search/instant_tab.cc', 'browser/ui/search/instant_tab.h', - 'browser/ui/search/new_tab_page_interceptor_service_factory.cc', - 'browser/ui/search/new_tab_page_interceptor_service_factory.h', 'browser/ui/search/new_tab_page_interceptor_service.cc', 'browser/ui/search/new_tab_page_interceptor_service.h', + 'browser/ui/search/new_tab_page_interceptor_service_factory.cc', + 'browser/ui/search/new_tab_page_interceptor_service_factory.h', 'browser/ui/search/search_ipc_router.cc', 'browser/ui/search/search_ipc_router.h', 'browser/ui/search/search_ipc_router_policy_impl.cc', @@ -898,6 +898,8 @@ 'browser/ui/website_settings/website_settings_ui.h', 'browser/ui/webui/about_ui.cc', 'browser/ui/webui/about_ui.h', + 'browser/ui/webui/chrome_web_ui_controller_factory.cc', + 'browser/ui/webui/chrome_web_ui_controller_factory.h', 'browser/ui/webui/chromeos/bluetooth_pairing_ui.cc', 'browser/ui/webui/chromeos/bluetooth_pairing_ui.h', 'browser/ui/webui/chromeos/certificate_manager_dialog_ui.cc', @@ -994,8 +996,6 @@ 'browser/ui/webui/chromeos/login/user_image_screen_handler.h', 'browser/ui/webui/chromeos/login/wrong_hwid_screen_handler.cc', 'browser/ui/webui/chromeos/login/wrong_hwid_screen_handler.h', - 'browser/ui/webui/chromeos/touch_view_controller_delegate.cc', - 'browser/ui/webui/chromeos/touch_view_controller_delegate.h', 'browser/ui/webui/chromeos/mobile_setup_dialog.cc', 'browser/ui/webui/chromeos/mobile_setup_dialog.h', 'browser/ui/webui/chromeos/mobile_setup_ui.cc', @@ -1020,10 +1020,10 @@ 'browser/ui/webui/chromeos/slow_trace_ui.h', 'browser/ui/webui/chromeos/slow_ui.cc', 'browser/ui/webui/chromeos/slow_ui.h', + 'browser/ui/webui/chromeos/touch_view_controller_delegate.cc', + 'browser/ui/webui/chromeos/touch_view_controller_delegate.h', 'browser/ui/webui/chromeos/ui_account_tweaks.cc', 'browser/ui/webui/chromeos/ui_account_tweaks.h', - 'browser/ui/webui/chrome_web_ui_controller_factory.cc', - 'browser/ui/webui/chrome_web_ui_controller_factory.h', 'browser/ui/webui/components_ui.cc', 'browser/ui/webui/components_ui.h', 'browser/ui/webui/constrained_web_dialog_delegate_base.cc', @@ -1100,9 +1100,9 @@ 'browser/ui/webui/user_actions/user_actions_ui_handler.cc', 'browser/ui/webui/user_actions/user_actions_ui_handler.h', 'browser/ui/webui/version_handler.cc', + 'browser/ui/webui/version_handler.h', 'browser/ui/webui/version_handler_chromeos.cc', 'browser/ui/webui/version_handler_chromeos.h', - 'browser/ui/webui/version_handler.h', 'browser/ui/webui/version_ui.cc', 'browser/ui/webui/version_ui.h', 'browser/ui/window_sizer/window_sizer_mac.mm', @@ -1137,17 +1137,17 @@ 'browser/ui/ash/app_list/app_list_controller_ash.h', 'browser/ui/ash/app_list/app_list_service_ash.cc', 'browser/ui/ash/app_list/app_list_service_ash.h', - 'browser/ui/ash/ash_init.cc', - 'browser/ui/ash/ash_init.h', - 'browser/ui/ash/ash_keyboard_controller_proxy.cc', - 'browser/ui/ash/ash_keyboard_controller_proxy.h', 'browser/ui/ash/app_list/app_sync_ui_state_watcher.cc', 'browser/ui/ash/app_list/app_sync_ui_state_watcher.h', 'browser/ui/ash/app_sync_ui_state.cc', 'browser/ui/ash/app_sync_ui_state.h', - 'browser/ui/ash/app_sync_ui_state_observer.h', 'browser/ui/ash/app_sync_ui_state_factory.cc', 'browser/ui/ash/app_sync_ui_state_factory.h', + 'browser/ui/ash/app_sync_ui_state_observer.h', + 'browser/ui/ash/ash_init.cc', + 'browser/ui/ash/ash_init.h', + 'browser/ui/ash/ash_keyboard_controller_proxy.cc', + 'browser/ui/ash/ash_keyboard_controller_proxy.h', 'browser/ui/ash/ash_util.cc', 'browser/ui/ash/ash_util.h', 'browser/ui/ash/chrome_launcher_prefs.cc', @@ -1165,10 +1165,10 @@ 'browser/ui/ash/ime_controller_chromeos.h', 'browser/ui/ash/launcher/app_shortcut_launcher_item_controller.cc', 'browser/ui/ash/launcher/app_shortcut_launcher_item_controller.h', - 'browser/ui/ash/launcher/app_window_launcher_item_controller.cc', - 'browser/ui/ash/launcher/app_window_launcher_item_controller.h', 'browser/ui/ash/launcher/app_window_launcher_controller.cc', 'browser/ui/ash/launcher/app_window_launcher_controller.h', + 'browser/ui/ash/launcher/app_window_launcher_item_controller.cc', + 'browser/ui/ash/launcher/app_window_launcher_item_controller.h', 'browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc', 'browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.h', 'browser/ui/ash/launcher/browser_status_monitor.cc', @@ -1185,10 +1185,10 @@ 'browser/ui/ash/launcher/chrome_launcher_controller.h', 'browser/ui/ash/launcher/chrome_launcher_controller_chromeos.cc', 'browser/ui/ash/launcher/chrome_launcher_controller_win.cc', - 'browser/ui/ash/launcher/launcher_application_menu_item_model.cc', - 'browser/ui/ash/launcher/launcher_application_menu_item_model.h', 'browser/ui/ash/launcher/launcher_app_tab_helper.cc', 'browser/ui/ash/launcher/launcher_app_tab_helper.h', + 'browser/ui/ash/launcher/launcher_application_menu_item_model.cc', + 'browser/ui/ash/launcher/launcher_application_menu_item_model.h', 'browser/ui/ash/launcher/launcher_context_menu.cc', 'browser/ui/ash/launcher/launcher_context_menu.h', 'browser/ui/ash/launcher/launcher_favicon_loader.cc', @@ -1387,10 +1387,10 @@ 'browser/ui/bookmarks/bookmark_drag_drop.h', 'browser/ui/bookmarks/bookmark_tab_helper_delegate.cc', 'browser/ui/bookmarks/bookmark_tab_helper_delegate.h', - 'browser/ui/bookmarks/enhanced_bookmark_key_service_factory.cc', - 'browser/ui/bookmarks/enhanced_bookmark_key_service_factory.h', 'browser/ui/bookmarks/enhanced_bookmark_key_service.cc', 'browser/ui/bookmarks/enhanced_bookmark_key_service.h', + 'browser/ui/bookmarks/enhanced_bookmark_key_service_factory.cc', + 'browser/ui/bookmarks/enhanced_bookmark_key_service_factory.h', 'browser/ui/browser.cc', 'browser/ui/browser.h', 'browser/ui/browser_command_controller.cc', @@ -1607,10 +1607,10 @@ 'browser/ui/webui/bookmarks_ui.h', 'browser/ui/webui/chrome_web_contents_handler.cc', 'browser/ui/webui/chrome_web_contents_handler.h', - 'browser/ui/webui/copresence_ui_handler.cc', - 'browser/ui/webui/copresence_ui_handler.h', 'browser/ui/webui/copresence_ui.cc', 'browser/ui/webui/copresence_ui.h', + 'browser/ui/webui/copresence_ui_handler.cc', + 'browser/ui/webui/copresence_ui_handler.h', 'browser/ui/webui/devtools_ui.cc', 'browser/ui/webui/devtools_ui.h', 'browser/ui/webui/downloads_dom_handler.cc', @@ -1877,23 +1877,23 @@ 'browser/ui/views/tabs/stacked_tab_strip_layout.cc', 'browser/ui/views/tabs/stacked_tab_strip_layout.h', 'browser/ui/views/tabs/tab.cc', + 'browser/ui/views/tabs/tab.h', 'browser/ui/views/tabs/tab_controller.h', 'browser/ui/views/tabs/tab_drag_controller.cc', 'browser/ui/views/tabs/tab_drag_controller.h', - 'browser/ui/views/tabs/tab.h', 'browser/ui/views/tabs/tab_strip.cc', - 'browser/ui/views/tabs/tab_strip_controller.h', 'browser/ui/views/tabs/tab_strip.h', - 'browser/ui/views/tabs/window_finder_chromeos.cc', + 'browser/ui/views/tabs/tab_strip_controller.h', 'browser/ui/views/tabs/window_finder.h', + 'browser/ui/views/tabs/window_finder_chromeos.cc', 'browser/ui/views/tabs/window_finder_mac.mm', 'browser/ui/views/tabs/window_finder_win.cc', 'browser/ui/views/toolbar/back_button.cc', 'browser/ui/views/toolbar/back_button.h', + 'browser/ui/views/toolbar/browser_action_test_util_views.cc', 'browser/ui/views/toolbar/browser_actions_container.cc', 'browser/ui/views/toolbar/browser_actions_container.h', 'browser/ui/views/toolbar/browser_actions_container_observer.h', - 'browser/ui/views/toolbar/browser_action_test_util_views.cc', 'browser/ui/views/toolbar/chevron_menu_button.cc', 'browser/ui/views/toolbar/chevron_menu_button.h', 'browser/ui/views/toolbar/extension_toolbar_menu_view.cc', @@ -1924,10 +1924,10 @@ 'browser/ui/views/frame/desktop_browser_frame_aura.h', 'browser/ui/views/message_center/message_center_frame_view.cc', 'browser/ui/views/message_center/message_center_frame_view.h', - 'browser/ui/views/message_center/message_center_widget_delegate.h', 'browser/ui/views/message_center/message_center_widget_delegate.cc', - 'browser/ui/views/message_center/web_notification_tray.h', + 'browser/ui/views/message_center/message_center_widget_delegate.h', 'browser/ui/views/message_center/web_notification_tray.cc', + 'browser/ui/views/message_center/web_notification_tray.h', 'browser/ui/views/message_center/web_notification_tray_win.cc', 'browser/ui/views/screen_capture_notification_ui_views.cc', ], @@ -1967,6 +1967,8 @@ 'browser/ui/views/apps/shaped_app_window_targeter.h', 'browser/ui/views/ash/tab_scrubber.cc', 'browser/ui/views/ash/tab_scrubber.h', + 'browser/ui/views/auto_keep_alive.cc', + 'browser/ui/views/auto_keep_alive.h', 'browser/ui/views/autofill/autofill_dialog_views.cc', 'browser/ui/views/autofill/autofill_dialog_views.h', 'browser/ui/views/autofill/autofill_popup_base_view.cc', @@ -1988,8 +1990,6 @@ 'browser/ui/views/autofill/password_generation_popup_view_views.h', 'browser/ui/views/autofill/tooltip_icon.cc', 'browser/ui/views/autofill/tooltip_icon.h', - 'browser/ui/views/auto_keep_alive.cc', - 'browser/ui/views/auto_keep_alive.h', 'browser/ui/views/bookmarks/bookmark_bar_instructions_view.cc', 'browser/ui/views/bookmarks/bookmark_bar_instructions_view.h', 'browser/ui/views/bookmarks/bookmark_bar_view.cc', @@ -2045,10 +2045,10 @@ 'browser/ui/views/download/download_shelf_view.h', 'browser/ui/views/download/download_started_animation_views.cc', 'browser/ui/views/dropdown_bar_host.cc', + 'browser/ui/views/dropdown_bar_host.h', 'browser/ui/views/dropdown_bar_host_aura.cc', 'browser/ui/views/dropdown_bar_host_delegate.h', 'browser/ui/views/dropdown_bar_host_mac.mm', - 'browser/ui/views/dropdown_bar_host.h', 'browser/ui/views/dropdown_bar_view.cc', 'browser/ui/views/dropdown_bar_view.h', 'browser/ui/views/edit_search_engine_dialog.cc', @@ -2115,23 +2115,23 @@ 'browser/ui/views/frame/contents_web_view.cc', 'browser/ui/views/frame/contents_web_view.h', 'browser/ui/views/frame/immersive_mode_controller.cc', + 'browser/ui/views/frame/immersive_mode_controller.h', 'browser/ui/views/frame/immersive_mode_controller_factory_ash.cc', 'browser/ui/views/frame/immersive_mode_controller_factory_mac.cc', - 'browser/ui/views/frame/immersive_mode_controller.h', 'browser/ui/views/frame/immersive_mode_controller_stub.cc', 'browser/ui/views/frame/immersive_mode_controller_stub.h', 'browser/ui/views/frame/minimize_button_metrics_win.cc', 'browser/ui/views/frame/minimize_button_metrics_win.h', + 'browser/ui/views/frame/native_browser_frame.h', 'browser/ui/views/frame/native_browser_frame_factory.cc', 'browser/ui/views/frame/native_browser_frame_factory.h', 'browser/ui/views/frame/native_browser_frame_factory_chromeos.cc', 'browser/ui/views/frame/native_browser_frame_factory_mac.cc', - 'browser/ui/views/frame/native_browser_frame.h', 'browser/ui/views/frame/opaque_browser_frame_view.cc', 'browser/ui/views/frame/opaque_browser_frame_view.h', 'browser/ui/views/frame/opaque_browser_frame_view_layout.cc', - 'browser/ui/views/frame/opaque_browser_frame_view_layout_delegate.h', 'browser/ui/views/frame/opaque_browser_frame_view_layout.h', + 'browser/ui/views/frame/opaque_browser_frame_view_layout_delegate.h', 'browser/ui/views/frame/opaque_browser_frame_view_linux.cc', 'browser/ui/views/frame/opaque_browser_frame_view_linux.h', 'browser/ui/views/frame/opaque_browser_frame_view_platform_specific.cc', @@ -2142,14 +2142,14 @@ 'browser/ui/views/frame/system_menu_model_builder.h', 'browser/ui/views/frame/system_menu_model_delegate.cc', 'browser/ui/views/frame/system_menu_model_delegate.h', - 'browser/ui/views/frame/taskbar_decorator.h', 'browser/ui/views/frame/taskbar_decorator.cc', + 'browser/ui/views/frame/taskbar_decorator.h', 'browser/ui/views/frame/taskbar_decorator_win.cc', 'browser/ui/views/frame/top_container_view.cc', 'browser/ui/views/frame/top_container_view.h', 'browser/ui/views/frame/web_contents_close_handler.cc', - 'browser/ui/views/frame/web_contents_close_handler_delegate.h', 'browser/ui/views/frame/web_contents_close_handler.h', + 'browser/ui/views/frame/web_contents_close_handler_delegate.h', 'browser/ui/views/global_error_bubble_view.cc', 'browser/ui/views/global_error_bubble_view.h', 'browser/ui/views/importer/import_lock_dialog_view.cc', @@ -2296,11 +2296,11 @@ 'browser/ui/views/validation_message_bubble_view.cc', 'browser/ui/views/validation_message_bubble_view.h', 'browser/ui/views/web_contents_modal_dialog_manager_views.cc', - 'browser/ui/views/website_settings/permissions_bubble_view.cc', - 'browser/ui/views/website_settings/permissions_bubble_view.h', 'browser/ui/views/website_settings/permission_selector_view.cc', 'browser/ui/views/website_settings/permission_selector_view.h', 'browser/ui/views/website_settings/permission_selector_view_observer.h', + 'browser/ui/views/website_settings/permissions_bubble_view.cc', + 'browser/ui/views/website_settings/permissions_bubble_view.h', 'browser/ui/views/website_settings/website_settings_popup_view.cc', 'browser/ui/views/website_settings/website_settings_popup_view.h', ], @@ -2470,8 +2470,8 @@ '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.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', 'browser/ui/autofill/data_model_wrapper.h', @@ -2479,10 +2479,10 @@ 'chrome_browser_ui_extensions_sources': [ 'browser/ui/extensions/accelerator_priority.cc', 'browser/ui/extensions/accelerator_priority.h', - 'browser/ui/extensions/application_launch.cc', - 'browser/ui/extensions/application_launch.h', 'browser/ui/extensions/app_launch_params.cc', 'browser/ui/extensions/app_launch_params.h', + 'browser/ui/extensions/application_launch.cc', + 'browser/ui/extensions/application_launch.h', 'browser/ui/extensions/extension_action_platform_delegate.h', 'browser/ui/extensions/extension_action_view_controller.cc', 'browser/ui/extensions/extension_action_view_controller.h', @@ -2529,12 +2529,12 @@ 'browser/ui/webui/nacl_ui.h', ], 'chrome_browser_ui_nss_sources': [ - 'browser/ui/webui/options/certificate_manager_handler.cc', - 'browser/ui/webui/options/certificate_manager_handler.h', 'browser/ui/crypto_module_delegate_nss.cc', 'browser/ui/crypto_module_delegate_nss.h', 'browser/ui/crypto_module_password_dialog_nss.cc', 'browser/ui/crypto_module_password_dialog_nss.h', + 'browser/ui/webui/options/certificate_manager_handler.cc', + 'browser/ui/webui/options/certificate_manager_handler.h', ], 'chrome_browser_ui_omnibox_sources': [ 'browser/ui/android/omnibox/omnibox_url_emphasizer.cc', diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi index 9617bf0..4a3b721 100644 --- a/chrome/chrome_common.gypi +++ b/chrome/chrome_common.gypi @@ -22,16 +22,16 @@ 'common/chrome_utility_messages.h', 'common/chrome_utility_printing_messages.h', 'common/chrome_version_info.cc', + 'common/chrome_version_info.h', 'common/chrome_version_info_android.cc', 'common/chrome_version_info_chromeos.cc', - 'common/chrome_version_info_posix.cc', 'common/chrome_version_info_mac.mm', + 'common/chrome_version_info_posix.cc', 'common/chrome_version_info_win.cc', - 'common/chrome_version_info.h', - 'common/cloud_print/cloud_print_class_mac.h', - 'common/cloud_print/cloud_print_class_mac.mm', 'common/cloud_print/cloud_print_cdd_conversion.cc', 'common/cloud_print/cloud_print_cdd_conversion.h', + 'common/cloud_print/cloud_print_class_mac.h', + 'common/cloud_print/cloud_print_class_mac.mm', 'common/cloud_print/cloud_print_constants.cc', 'common/cloud_print/cloud_print_constants.h', 'common/cloud_print/cloud_print_helpers.cc', @@ -73,9 +73,9 @@ 'common/mac/launchd.mm', 'common/mac/objc_zombie.h', 'common/mac/objc_zombie.mm', - 'common/media/webrtc_logging_messages.h', 'common/media/webrtc_logging_message_data.cc', 'common/media/webrtc_logging_message_data.h', + 'common/media/webrtc_logging_messages.h', 'common/media_galleries/metadata_types.h', 'common/multi_process_lock.h', 'common/multi_process_lock_linux.cc', @@ -185,8 +185,8 @@ 'common/extensions/manifest_handlers/automation.h', 'common/extensions/manifest_handlers/content_scripts_handler.cc', 'common/extensions/manifest_handlers/content_scripts_handler.h', - 'common/extensions/manifest_handlers/copresence_manifest.h', 'common/extensions/manifest_handlers/copresence_manifest.cc', + 'common/extensions/manifest_handlers/copresence_manifest.h', 'common/extensions/manifest_handlers/extension_action_handler.cc', 'common/extensions/manifest_handlers/extension_action_handler.h', 'common/extensions/manifest_handlers/minimum_chrome_version_checker.cc', @@ -255,14 +255,14 @@ 'common/media_galleries/pmp_constants.h', ], 'chrome_common_networking_private_sources_openssl' : [ - 'common/extensions/api/networking_private/networking_private_crypto_openssl.cc', 'common/extensions/api/networking_private/networking_private_crypto.cc', 'common/extensions/api/networking_private/networking_private_crypto.h', + 'common/extensions/api/networking_private/networking_private_crypto_openssl.cc', ], 'chrome_common_networking_private_sources_nss' : [ - 'common/extensions/api/networking_private/networking_private_crypto_nss.cc', 'common/extensions/api/networking_private/networking_private_crypto.cc', 'common/extensions/api/networking_private/networking_private_crypto.h', + 'common/extensions/api/networking_private/networking_private_crypto_nss.cc', ], 'chrome_common_mac_sources': [ @@ -583,9 +583,9 @@ 'common/net/url_util.cc', 'common/net/url_util.h', 'common/net/x509_certificate_model.cc', + 'common/net/x509_certificate_model.h', 'common/net/x509_certificate_model_nss.cc', 'common/net/x509_certificate_model_openssl.cc', - 'common/net/x509_certificate_model.h', ], 'dependencies': [ '<(DEPTH)/base/base.gyp:base', diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi index 0885668..0897fb4 100644 --- a/chrome/chrome_dll.gypi +++ b/chrome/chrome_dll.gypi @@ -78,18 +78,18 @@ 'enable_wexit_time_destructors': 1, }, 'sources': [ + '../base/win/dllmain.cc', 'app/chrome_command_ids.h', 'app/chrome_dll_resource.h', 'app/chrome_main.cc', 'app/chrome_main_delegate.cc', 'app/chrome_main_delegate.h', - 'app/chrome_main_mac.mm', 'app/chrome_main_mac.h', + 'app/chrome_main_mac.mm', 'app/close_handle_hook_win.cc', 'app/close_handle_hook_win.h', 'app/delay_load_hook_win.cc', 'app/delay_load_hook_win.h', - '../base/win/dllmain.cc', ], 'dependencies': [ '<@(chromium_browser_dependencies)', diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi index d027f37..81fcfeb 100644 --- a/chrome/chrome_exe.gypi +++ b/chrome/chrome_exe.gypi @@ -492,12 +492,12 @@ '../win8/delegate_execute/delegate_execute.gyp:*', ], 'sources': [ + '<(SHARED_INTERMEDIATE_DIR)/chrome_version/chrome_exe_version.rc', 'app/chrome_crash_reporter_client.cc', 'app/chrome_crash_reporter_client.h', 'app/chrome_exe.rc', 'common/crash_keys.cc', 'common/crash_keys.h', - '<(SHARED_INTERMEDIATE_DIR)/chrome_version/chrome_exe_version.rc', ], 'sources!': [ # We still want the _win entry point for sandbox, etc. @@ -599,15 +599,15 @@ 'type': 'executable', 'product_name': 'nacl64', 'sources': [ - 'app/chrome_crash_reporter_client.cc', - 'common/crash_keys.cc', - 'nacl/nacl_exe_win_64.cc', '../content/app/startup_helper_win.cc', '../content/common/sandbox_init_win.cc', '../content/common/sandbox_win.cc', '../content/public/common/content_switches.cc', '../content/public/common/sandboxed_process_launcher_delegate.cc', '<(SHARED_INTERMEDIATE_DIR)/chrome_version/nacl64_exe_version.rc', + 'app/chrome_crash_reporter_client.cc', + 'common/crash_keys.cc', + 'nacl/nacl_exe_win_64.cc', ], 'dependencies': [ 'chrome_version_resources', diff --git a/chrome/chrome_installer.gypi b/chrome/chrome_installer.gypi index ed2bcd5..2ed092f 100644 --- a/chrome/chrome_installer.gypi +++ b/chrome/chrome_installer.gypi @@ -67,10 +67,10 @@ 'installer/gcapi/gcapi_last_run_test.cc', 'installer/gcapi/gcapi_omaha_experiment_test.cc', 'installer/gcapi/gcapi_reactivation_test.cc', - 'installer/gcapi/gcapi_test_registry_overrider.cc', - 'installer/gcapi/gcapi_test_registry_overrider.h', 'installer/gcapi/gcapi_test.cc', 'installer/gcapi/gcapi_test.rc', + 'installer/gcapi/gcapi_test_registry_overrider.cc', + 'installer/gcapi/gcapi_test_registry_overrider.h', 'installer/gcapi/resource.h', ], }, @@ -93,6 +93,7 @@ '..', ], 'sources': [ + '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', 'installer/setup/compat_checks_unittest.cc', 'installer/setup/setup_constants.cc', 'installer/util/advanced_firewall_manager_win_unittest.cc', @@ -137,7 +138,6 @@ 'installer/util/uninstall_metrics_unittest.cc', 'installer/util/wmi_unittest.cc', 'installer/util/work_item_list_unittest.cc', - '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', ], 'msvs_settings': { 'VCManifestTool': { diff --git a/chrome/chrome_installer_util.gypi b/chrome/chrome_installer_util.gypi index 182e256..8c9d875 100644 --- a/chrome/chrome_installer_util.gypi +++ b/chrome/chrome_installer_util.gypi @@ -78,16 +78,16 @@ 'installer/util/master_preferences_constants.h', 'installer/util/move_tree_work_item.cc', 'installer/util/move_tree_work_item.h', - 'installer/util/non_updating_app_registration_data.h', 'installer/util/non_updating_app_registration_data.cc', + 'installer/util/non_updating_app_registration_data.h', 'installer/util/registry_key_backup.cc', 'installer/util/registry_key_backup.h', 'installer/util/self_reg_work_item.cc', 'installer/util/self_reg_work_item.h', 'installer/util/set_reg_value_work_item.cc', 'installer/util/set_reg_value_work_item.h', - 'installer/util/updating_app_registration_data.h', 'installer/util/updating_app_registration_data.cc', + 'installer/util/updating_app_registration_data.h', 'installer/util/util_constants.cc', 'installer/util/util_constants.h', 'installer/util/wmi.cc', @@ -152,8 +152,8 @@ 'installer/util/lzma_util.h', 'installer/util/master_preferences.cc', 'installer/util/master_preferences.h', - 'installer/util/product.h', 'installer/util/product.cc', + 'installer/util/product.h', 'installer/util/product_operations.h', 'installer/util/self_cleaning_temp_dir.cc', 'installer/util/self_cleaning_temp_dir.h', diff --git a/chrome/chrome_nibs.gyp b/chrome/chrome_nibs.gyp index 9c62303..a5c9bc2 100644 --- a/chrome/chrome_nibs.gyp +++ b/chrome/chrome_nibs.gyp @@ -85,6 +85,8 @@ 'browser/ui/cocoa/bookmarks/bookmark_name_folder_controller.mm', 'browser/ui/cocoa/browser/avatar_menu_bubble_controller.h', 'browser/ui/cocoa/browser/avatar_menu_bubble_controller.mm', + 'browser/ui/cocoa/browser/edit_search_engine_cocoa_controller.h', + 'browser/ui/cocoa/browser/edit_search_engine_cocoa_controller.mm', 'browser/ui/cocoa/browser_window_controller.h', 'browser/ui/cocoa/browser_window_controller.mm', 'browser/ui/cocoa/browser_window_controller_private.h', @@ -95,6 +97,10 @@ 'browser/ui/cocoa/chrome_event_processing_window.mm', 'browser/ui/cocoa/clickhold_button_cell.h', 'browser/ui/cocoa/clickhold_button_cell.mm', + 'browser/ui/cocoa/constrained_window/constrained_window_button.h', + 'browser/ui/cocoa/constrained_window/constrained_window_button.mm', + 'browser/ui/cocoa/constrained_window/constrained_window_custom_window.h', + 'browser/ui/cocoa/constrained_window/constrained_window_custom_window.mm', 'browser/ui/cocoa/content_settings/collected_cookies_mac.h', 'browser/ui/cocoa/content_settings/collected_cookies_mac.mm', 'browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.h', @@ -119,16 +125,10 @@ 'browser/ui/cocoa/download/download_show_all_cell.mm', 'browser/ui/cocoa/draggable_button.h', 'browser/ui/cocoa/draggable_button.mm', - 'browser/ui/cocoa/browser/edit_search_engine_cocoa_controller.h', - 'browser/ui/cocoa/browser/edit_search_engine_cocoa_controller.mm', - 'browser/ui/cocoa/constrained_window/constrained_window_button.h', - 'browser/ui/cocoa/constrained_window/constrained_window_button.mm', - 'browser/ui/cocoa/constrained_window/constrained_window_custom_window.h', - 'browser/ui/cocoa/constrained_window/constrained_window_custom_window.mm', - 'browser/ui/cocoa/exclusive_access_bubble_window_controller.h', - 'browser/ui/cocoa/exclusive_access_bubble_window_controller.mm', 'browser/ui/cocoa/exclusive_access_bubble_view.h', 'browser/ui/cocoa/exclusive_access_bubble_view.mm', + 'browser/ui/cocoa/exclusive_access_bubble_window_controller.h', + 'browser/ui/cocoa/exclusive_access_bubble_window_controller.mm', 'browser/ui/cocoa/extensions/browser_actions_container_view.h', 'browser/ui/cocoa/extensions/browser_actions_container_view.mm', 'browser/ui/cocoa/extensions/device_permissions_view_controller.h', @@ -189,6 +189,10 @@ 'browser/ui/cocoa/nsmenuitem_additions.mm', 'browser/ui/cocoa/one_click_signin_view_controller.h', 'browser/ui/cocoa/one_click_signin_view_controller.mm', + 'browser/ui/cocoa/panels/panel_titlebar_view_cocoa.h', + 'browser/ui/cocoa/panels/panel_titlebar_view_cocoa.mm', + 'browser/ui/cocoa/panels/panel_window_controller_cocoa.h', + 'browser/ui/cocoa/panels/panel_window_controller_cocoa.mm', 'browser/ui/cocoa/screen_capture_notification_ui_cocoa.h', 'browser/ui/cocoa/screen_capture_notification_ui_cocoa.mm', 'browser/ui/cocoa/status_bubble_mac.h', @@ -237,10 +241,6 @@ 'browser/ui/cocoa/wrench_menu/menu_tracked_root_view.mm', 'browser/ui/cocoa/wrench_menu/wrench_menu_controller.h', 'browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm', - 'browser/ui/cocoa/panels/panel_titlebar_view_cocoa.h', - 'browser/ui/cocoa/panels/panel_titlebar_view_cocoa.mm', - 'browser/ui/cocoa/panels/panel_window_controller_cocoa.h', - 'browser/ui/cocoa/panels/panel_window_controller_cocoa.mm', ], 'mac_bundle_resources': [ '<@(mac_all_xibs)', diff --git a/chrome/chrome_renderer.gypi b/chrome/chrome_renderer.gypi index d9f9674..b34ee50 100644 --- a/chrome/chrome_renderer.gypi +++ b/chrome/chrome_renderer.gypi @@ -7,21 +7,6 @@ 'chrome_renderer_sources': [ 'renderer/benchmarking_extension.cc', 'renderer/benchmarking_extension.h', - 'renderer/isolated_world_ids.h', - 'renderer/loadtimes_extension_bindings.cc', - 'renderer/loadtimes_extension_bindings.h', - 'renderer/media/chrome_key_systems.cc', - 'renderer/media/chrome_key_systems.h', - 'renderer/net/net_error_helper.cc', - 'renderer/net/net_error_helper.h', - 'renderer/net/net_error_page_controller.cc', - 'renderer/net/net_error_page_controller.h', - 'renderer/net_benchmarking_extension.cc', - 'renderer/net_benchmarking_extension.h', - 'renderer/playback_extension.cc', - 'renderer/playback_extension.h', - 'renderer/principals_extension_bindings.cc', - 'renderer/principals_extension_bindings.h', 'renderer/chrome_content_renderer_client.cc', 'renderer/chrome_content_renderer_client.h', 'renderer/chrome_render_frame_observer.cc', @@ -36,8 +21,21 @@ 'renderer/external_extension.cc', 'renderer/external_extension.h', 'renderer/instant_restricted_id_cache.h', + 'renderer/isolated_world_ids.h', + 'renderer/loadtimes_extension_bindings.cc', + 'renderer/loadtimes_extension_bindings.h', + 'renderer/media/chrome_key_systems.cc', + 'renderer/media/chrome_key_systems.h', + 'renderer/net/net_error_helper.cc', + 'renderer/net/net_error_helper.h', + 'renderer/net/net_error_page_controller.cc', + 'renderer/net/net_error_page_controller.h', + 'renderer/net_benchmarking_extension.cc', + 'renderer/net_benchmarking_extension.h', 'renderer/page_load_histograms.cc', 'renderer/page_load_histograms.h', + 'renderer/playback_extension.cc', + 'renderer/playback_extension.h', 'renderer/plugins/chrome_plugin_placeholder.cc', 'renderer/plugins/chrome_plugin_placeholder.h', 'renderer/plugins/plugin_uma.cc', @@ -54,6 +52,8 @@ 'renderer/prerender/prerender_helper.h', 'renderer/prerender/prerenderer_client.cc', 'renderer/prerender/prerenderer_client.h', + 'renderer/principals_extension_bindings.cc', + 'renderer/principals_extension_bindings.h', 'renderer/searchbox/search_bouncer.cc', 'renderer/searchbox/search_bouncer.h', 'renderer/searchbox/searchbox.cc', @@ -120,10 +120,10 @@ 'renderer/extensions/tabs_custom_bindings.h', 'renderer/extensions/webstore_bindings.cc', 'renderer/extensions/webstore_bindings.h', - 'renderer/media/cast_rtp_stream.cc', - 'renderer/media/cast_rtp_stream.h', 'renderer/media/cast_ipc_dispatcher.cc', 'renderer/media/cast_ipc_dispatcher.h', + 'renderer/media/cast_rtp_stream.cc', + 'renderer/media/cast_rtp_stream.h', 'renderer/media/cast_session.cc', 'renderer/media/cast_session.h', 'renderer/media/cast_session_delegate.cc', @@ -222,12 +222,12 @@ 'renderer/spellchecker/custom_dictionary_engine.h', 'renderer/spellchecker/hunspell_engine.cc', 'renderer/spellchecker/hunspell_engine.h', - 'renderer/spellchecker/spellcheck_provider.cc', - 'renderer/spellchecker/spellcheck_provider.h', 'renderer/spellchecker/spellcheck.cc', 'renderer/spellchecker/spellcheck.h', 'renderer/spellchecker/spellcheck_language.cc', 'renderer/spellchecker/spellcheck_language.h', + 'renderer/spellchecker/spellcheck_provider.cc', + 'renderer/spellchecker/spellcheck_provider.h', 'renderer/spellchecker/spellcheck_worditerator.cc', 'renderer/spellchecker/spellcheck_worditerator.h', 'renderer/spellchecker/spelling_engine.h', diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 71523f0..8e3df72 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -17,17 +17,17 @@ 'browser/extensions/extension_function_test_utils.h', 'browser/extensions/extension_test_notification_observer.cc', 'browser/extensions/extension_test_notification_observer.h', - 'browser/extensions/updater/extension_cache_fake.h', 'browser/extensions/updater/extension_cache_fake.cc', + 'browser/extensions/updater/extension_cache_fake.h', ], 'chrome_browser_tests_sources': [ # The list of sources which is only used by chrome browser tests. '../apps/app_restore_service_browsertest.cc', '../apps/load_and_launch_browsertest.cc', - '../components/autofill/content/renderer/test_password_autofill_agent.h', '../components/autofill/content/renderer/test_password_autofill_agent.cc', - '../components/autofill/content/renderer/test_password_generation_agent.h', + '../components/autofill/content/renderer/test_password_autofill_agent.h', '../components/autofill/content/renderer/test_password_generation_agent.cc', + '../components/autofill/content/renderer/test_password_generation_agent.h', # TODO(rockot): Remove this once extensions_browsertests exists. '../extensions/browser/api/app_window/app_window_apitest.cc', '../extensions/browser/api/bluetooth/bluetooth_apitest.cc', @@ -121,11 +121,11 @@ 'browser/extensions/api/automation/automation_apitest.cc', 'browser/extensions/api/autotest_private/autotest_private_apitest.cc', 'browser/extensions/api/bookmark_manager_private/bookmark_manager_private_apitest.cc', + 'browser/extensions/api/bookmarks/bookmark_apitest.cc', 'browser/extensions/api/braille_display_private/braille_display_private_apitest.cc', 'browser/extensions/api/braille_display_private/mock_braille_controller.cc', 'browser/extensions/api/braille_display_private/mock_braille_controller.h', 'browser/extensions/api/browser/browser_apitest.cc', - 'browser/extensions/api/bookmarks/bookmark_apitest.cc', 'browser/extensions/api/browsing_data/browsing_data_test.cc', 'browser/extensions/api/cast_streaming/cast_streaming_apitest.cc', 'browser/extensions/api/cloud_print_private/cloud_print_private_apitest.cc', @@ -148,13 +148,13 @@ 'browser/extensions/api/extension_action/browser_action_apitest.cc', 'browser/extensions/api/extension_action/browser_action_browsertest.cc', 'browser/extensions/api/extension_action/page_action_apitest.cc', - 'browser/extensions/api/feedback_private/feedback_private_apitest.cc', 'browser/extensions/api/feedback_private/feedback_browsertest.cc', + 'browser/extensions/api/feedback_private/feedback_private_apitest.cc', 'browser/extensions/api/file_system/file_system_apitest.cc', 'browser/extensions/api/file_system/file_system_apitest_chromeos.cc', 'browser/extensions/api/font_settings/font_settings_apitest.cc', - 'browser/extensions/api/gcm/gcm_apitest.cc', 'browser/extensions/api/gcd_private/gcd_private_apitest.cc', + 'browser/extensions/api/gcm/gcm_apitest.cc', 'browser/extensions/api/history/history_apitest.cc', 'browser/extensions/api/hotword_private/hotword_private_apitest.cc', 'browser/extensions/api/i18n/i18n_apitest.cc', @@ -175,6 +175,7 @@ 'browser/extensions/api/metrics_private/metrics_apitest.cc', 'browser/extensions/api/module/module_apitest.cc', 'browser/extensions/api/music_manager_private/music_manager_private_browsertest.cc', + 'browser/extensions/api/networking_config_chromeos_apitest_chromeos.cc', 'browser/extensions/api/notification_provider/notification_provider_apitest.cc', 'browser/extensions/api/omnibox/omnibox_api_browsertest.cc', 'browser/extensions/api/page_capture/page_capture_apitest.cc', @@ -194,8 +195,8 @@ 'browser/extensions/api/socket/socket_apitest.cc', 'browser/extensions/api/storage/settings_apitest.cc', 'browser/extensions/api/streams_private/streams_private_apitest.cc', - 'browser/extensions/api/sync_file_system/sync_file_system_browsertest.cc', 'browser/extensions/api/sync_file_system/sync_file_system_apitest.cc', + 'browser/extensions/api/sync_file_system/sync_file_system_browsertest.cc', 'browser/extensions/api/system_indicator/system_indicator_apitest.cc', 'browser/extensions/api/system_private/system_private_apitest.cc', 'browser/extensions/api/tab_capture/tab_capture_apitest.cc', @@ -217,9 +218,9 @@ 'browser/extensions/chrome_app_api_browsertest.cc', 'browser/extensions/chrome_ui_overrides_browsertest.cc', 'browser/extensions/content_capabilities_browsertest.cc', - 'browser/extensions/content_verifier_browsertest.cc', 'browser/extensions/content_script_apitest.cc', 'browser/extensions/content_security_policy_apitest.cc', + 'browser/extensions/content_verifier_browsertest.cc', 'browser/extensions/convert_web_app_browsertest.cc', 'browser/extensions/crazy_extension_browsertest.cc', 'browser/extensions/cross_origin_xhr_apitest.cc', @@ -261,7 +262,6 @@ 'browser/extensions/lazy_background_page_apitest.cc', 'browser/extensions/lazy_background_page_test_util.h', 'browser/extensions/mutation_observers_apitest.cc', - 'browser/extensions/api/networking_config_chromeos_apitest_chromeos.cc', 'browser/extensions/options_page_apitest.cc', 'browser/extensions/page_action_browsertest.cc', 'browser/extensions/plugin_apitest.cc', @@ -301,9 +301,6 @@ 'browser/lifetime/browser_close_manager_browsertest.cc', 'browser/loadtimes_extension_bindings_browsertest.cc', 'browser/locale_tests_browsertest.cc', - 'browser/media/encrypted_media_browsertest.cc', - 'browser/media/media_browsertest.cc', - 'browser/media/media_browsertest.h', 'browser/media/chrome_media_stream_infobar_browsertest.cc', 'browser/media/chrome_webrtc_apprtc_browsertest.cc', 'browser/media/chrome_webrtc_audio_quality_browsertest.cc', @@ -314,13 +311,16 @@ 'browser/media/chrome_webrtc_simulcast_browsertest.cc', 'browser/media/chrome_webrtc_video_quality_browsertest.cc', 'browser/media/chrome_webrtc_webcam_browsertest.cc', + 'browser/media/encrypted_media_browsertest.cc', 'browser/media/encrypted_media_istypesupported_browsertest.cc', + 'browser/media/media_browsertest.cc', + 'browser/media/media_browsertest.h', 'browser/media/media_stream_devices_controller_browsertest.cc', 'browser/media/test_license_server.cc', 'browser/media/test_license_server.h', 'browser/media/test_license_server_config.h', - 'browser/media/webrtc_browsertest_audio.h', 'browser/media/webrtc_browsertest_audio.cc', + 'browser/media/webrtc_browsertest_audio.h', 'browser/media/webrtc_browsertest_base.cc', 'browser/media/webrtc_browsertest_base.h', 'browser/media/webrtc_browsertest_common.cc', @@ -356,11 +356,11 @@ 'browser/printing/print_preview_dialog_controller_browsertest.cc', 'browser/printing/print_preview_pdf_generated_browsertest.cc', 'browser/process_singleton_browsertest.cc', + 'browser/profile_resetter/profile_resetter_browsertest.cc', 'browser/profiles/host_zoom_map_browsertest.cc', 'browser/profiles/profile_browsertest.cc', 'browser/profiles/profile_list_desktop_browsertest.cc', 'browser/profiles/profile_manager_browsertest.cc', - 'browser/profile_resetter/profile_resetter_browsertest.cc', 'browser/referrer_policy_browsertest.cc', 'browser/renderer_context_menu/render_view_context_menu_browsertest.cc', 'browser/renderer_context_menu/render_view_context_menu_browsertest_util.cc', @@ -374,8 +374,8 @@ 'browser/repost_form_warning_browsertest.cc', 'browser/resources/pdf/pdf_extension_test.cc', 'browser/safe_json_parser_browsertest.cc', - 'browser/search/suggestions/image_fetcher_impl_browsertest.cc', 'browser/search/hotword_installer_browsertest.cc', + 'browser/search/suggestions/image_fetcher_impl_browsertest.cc', 'browser/service_process/service_process_control_browsertest.cc', 'browser/services/gcm/fake_gcm_profile_service.cc', 'browser/services/gcm/fake_gcm_profile_service.h', @@ -413,13 +413,13 @@ 'browser/translate/translate_manager_browsertest.cc', 'browser/ui/ash/accelerator_commands_browsertest.cc', 'browser/ui/ash/accelerator_controller_browsertest.cc', + 'browser/ui/ash/keyboard_controller_browsertest.cc', 'browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc', 'browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc', - 'browser/ui/ash/keyboard_controller_browsertest.cc', 'browser/ui/ash/multi_user/multi_user_window_manager_test.cc', 'browser/ui/ash/multi_user/multi_user_window_manager_test.h', - 'browser/ui/ash/system_tray_delegate_chromeos_browsertest_chromeos.cc', 'browser/ui/ash/shelf_browsertest.cc', + 'browser/ui/ash/system_tray_delegate_chromeos_browsertest_chromeos.cc', 'browser/ui/ash/volume_controller_browsertest_chromeos.cc', 'browser/ui/autofill/autofill_dialog_controller_browsertest.cc', 'browser/ui/autofill/autofill_dialog_view_tester.h', @@ -427,10 +427,10 @@ 'browser/ui/autofill/mock_address_validator.h', 'browser/ui/autofill/password_generation_popup_view_browsertest.cc', 'browser/ui/autofill/password_generation_popup_view_tester.h', - 'browser/ui/autofill/test_generated_credit_card_bubble_view.cc', - 'browser/ui/autofill/test_generated_credit_card_bubble_view.h', 'browser/ui/autofill/test_generated_credit_card_bubble_controller.cc', 'browser/ui/autofill/test_generated_credit_card_bubble_controller.h', + 'browser/ui/autofill/test_generated_credit_card_bubble_view.cc', + 'browser/ui/autofill/test_generated_credit_card_bubble_view.h', 'browser/ui/blocked_content/popup_blocker_browsertest.cc', 'browser/ui/bookmarks/bookmark_browsertest.cc', 'browser/ui/bookmarks/bookmark_bubble_sign_in_delegate_browsertest.cc', @@ -447,8 +447,8 @@ 'browser/ui/cocoa/apps/app_shim_menu_controller_mac_browsertest.mm', 'browser/ui/cocoa/apps/native_app_window_cocoa_browsertest.mm', 'browser/ui/cocoa/autofill/autofill_dialog_cocoa_browsertest.mm', - 'browser/ui/cocoa/autofill/autofill_dialog_view_tester_cocoa.mm', 'browser/ui/cocoa/autofill/autofill_dialog_view_tester_cocoa.h', + 'browser/ui/cocoa/autofill/autofill_dialog_view_tester_cocoa.mm', 'browser/ui/cocoa/browser_window_controller_browsertest.mm', 'browser/ui/cocoa/certificate_viewer_mac_browsertest.mm', 'browser/ui/cocoa/constrained_window/constrained_window_mac_browsertest.mm', @@ -473,8 +473,8 @@ 'browser/ui/exclusive_access/fullscreen_controller_browsertest.cc', 'browser/ui/find_bar/find_bar_host_browsertest.cc', 'browser/ui/global_error/global_error_service_browsertest.cc', - 'browser/ui/login/login_prompt_browsertest.cc', 'browser/ui/location_bar/location_bar_browsertest.cc', + 'browser/ui/login/login_prompt_browsertest.cc', 'browser/ui/native_window_tracker_browsertest.cc', 'browser/ui/panels/panel_extension_browsertest.cc', 'browser/ui/passwords/manage_passwords_test.cc', @@ -519,8 +519,8 @@ 'browser/ui/webui/options/options_ui_browsertest.h', 'browser/ui/webui/password_manager_internals/password_manager_internals_ui_browsertest.cc', 'browser/ui/webui/print_preview/print_preview_ui_browsertest.cc', - 'browser/ui/webui/signin/user_manager_ui_browsertest.cc', 'browser/ui/webui/signin/inline_login_ui_browsertest.cc', + 'browser/ui/webui/signin/user_manager_ui_browsertest.cc', 'browser/ui/webui/web_ui_test_handler.cc', 'browser/ui/webui/web_ui_test_handler.h', 'browser/ui/zoom/zoom_controller_browsertest.cc', @@ -529,29 +529,29 @@ 'common/mac/mock_launchd.cc', 'common/mac/mock_launchd.h', 'common/time_format_browsertest.cc', - 'renderer/chrome_content_renderer_client_browsertest.cc', 'renderer/autofill/autofill_renderer_browsertest.cc', 'renderer/autofill/form_autocomplete_browsertest.cc', 'renderer/autofill/form_autofill_browsertest.cc', 'renderer/autofill/page_click_tracker_browsertest.cc', 'renderer/autofill/password_autofill_agent_browsertest.cc', 'renderer/autofill/password_generation_agent_browsertest.cc', + 'renderer/chrome_content_renderer_client_browsertest.cc', 'renderer/content_settings_observer_browsertest.cc', 'renderer/media/cast_session_browsertest.cc', 'renderer/translate/translate_helper_browsertest.cc', 'renderer/translate/translate_script_browsertest.cc', 'test/base/chrome_render_view_test.cc', 'test/base/chrome_render_view_test.h', - 'test/base/web_ui_browser_test.cc', - 'test/base/web_ui_browser_test.h', - 'test/base/web_ui_browser_test_browsertest.cc', 'test/base/in_process_browser_test_browsertest.cc', 'test/base/javascript_browser_test.cc', 'test/base/javascript_browser_test.h', - 'test/base/tracing_browsertest.cc', 'test/base/test_chrome_web_ui_controller_factory.cc', 'test/base/test_chrome_web_ui_controller_factory.h', 'test/base/test_chrome_web_ui_controller_factory_browsertest.cc', + 'test/base/tracing_browsertest.cc', + 'test/base/web_ui_browser_test.cc', + 'test/base/web_ui_browser_test.h', + 'test/base/web_ui_browser_test_browsertest.cc', 'test/data/webui/async_gen.cc', 'test/data/webui/async_gen.h', 'test/data/webui/certificate_viewer_ui_test-inl.h', @@ -673,7 +673,6 @@ #'browser/chromeos/login/resource_loader_browsertest.cc', 'browser/chromeos/login/proxy_auth_dialog_browsertest.cc', 'browser/chromeos/login/saml/saml_browsertest.cc', - 'browser/chromeos/login/session_login_browsertest.cc', 'browser/chromeos/login/screens/mock_base_screen_delegate.cc', 'browser/chromeos/login/screens/mock_base_screen_delegate.h', 'browser/chromeos/login/screens/mock_enable_debugging_screen.cc', @@ -690,11 +689,12 @@ 'browser/chromeos/login/screens/mock_wrong_hwid_screen.h', 'browser/chromeos/login/screens/network_screen_browsertest.cc', 'browser/chromeos/login/screens/update_screen_browsertest.cc', + 'browser/chromeos/login/session_login_browsertest.cc', + 'browser/chromeos/login/signin/oauth2_browsertest.cc', 'browser/chromeos/login/supervised/supervised_user_creation_browsertest.cc', 'browser/chromeos/login/supervised/supervised_user_password_browsertest.cc', 'browser/chromeos/login/supervised/supervised_user_test_base.cc', 'browser/chromeos/login/supervised/supervised_user_test_base.h', - 'browser/chromeos/login/signin/oauth2_browsertest.cc', 'browser/chromeos/login/test/app_window_waiter.cc', 'browser/chromeos/login/test/app_window_waiter.h', 'browser/chromeos/login/test/https_forwarder.cc', @@ -893,14 +893,14 @@ 'browser/extensions/browsertest_util.cc', 'browser/extensions/extension_apitest.cc', 'browser/extensions/extension_browsertest.cc', - 'browser/extensions/extension_test_notification_observer.cc', + 'browser/extensions/extension_commands_global_registry_apitest.cc', 'browser/extensions/extension_crash_recovery_browsertest.cc', 'browser/extensions/extension_fullscreen_apitest.cc', 'browser/extensions/extension_function_test_utils.cc', - 'browser/extensions/extension_commands_global_registry_apitest.cc', 'browser/extensions/extension_keybinding_apitest.cc', - 'browser/extensions/updater/extension_cache_fake.h', + 'browser/extensions/extension_test_notification_observer.cc', 'browser/extensions/updater/extension_cache_fake.cc', + 'browser/extensions/updater/extension_cache_fake.h', 'browser/extensions/window_open_interactive_apitest.cc', 'browser/mouseleave_browsertest.cc', 'browser/password_manager/password_generation_interactive_uitest.cc', @@ -921,27 +921,27 @@ 'browser/ui/panels/base_panel_browser_test.h', 'browser/ui/panels/test_panel_active_state_observer.cc', 'browser/ui/panels/test_panel_active_state_observer.h', + 'browser/ui/panels/test_panel_collection_squeeze_observer.cc', + 'browser/ui/panels/test_panel_collection_squeeze_observer.h', 'browser/ui/panels/test_panel_mouse_watcher.cc', 'browser/ui/panels/test_panel_mouse_watcher.h', 'browser/ui/panels/test_panel_notification_observer.cc', 'browser/ui/panels/test_panel_notification_observer.h', - 'browser/ui/panels/test_panel_collection_squeeze_observer.cc', - 'browser/ui/panels/test_panel_collection_squeeze_observer.h', 'browser/ui/passwords/manage_passwords_test.cc', 'browser/ui/passwords/manage_passwords_test.h', - 'browser/ui/search/instant_extended_interactive_uitest.cc', 'browser/ui/pdf/pdf_interactive_browsertest.cc', + 'browser/ui/search/instant_extended_interactive_uitest.cc', 'browser/ui/search/instant_extended_manual_interactive_uitest.cc', - 'browser/ui/search/instant_test_utils.h', 'browser/ui/search/instant_test_utils.cc', + 'browser/ui/search/instant_test_utils.h', 'browser/ui/search/local_ntp_browsertest.cc', 'browser/ui/startup/startup_browser_creator_interactive_uitest.cc', 'browser/ui/toolbar/test_toolbar_model.cc', 'browser/ui/toolbar/test_toolbar_model.h', + 'browser/ui/views/accessibility/navigation_accessibility_uitest_win.cc', 'browser/ui/webui/options/autofill_options_interactive_uitest.cc', 'browser/ui/webui/options/language_dictionary_interactive_uitest.cc', 'browser/ui/webui/options/language_options_interactive_uitest.cc', - 'browser/ui/views/accessibility/navigation_accessibility_uitest_win.cc', 'test/base/interactive_test_utils.cc', 'test/base/interactive_test_utils.h', 'test/base/interactive_test_utils_aura.cc', @@ -1051,17 +1051,17 @@ 'browser/chromeos/login/mixin_based_browser_test.cc', 'browser/chromeos/login/mixin_based_browser_test.h', 'browser/chromeos/login/oobe_browsertest.cc', - 'browser/chromeos/login/screenshot_testing/screenshot_tester.cc', - 'browser/chromeos/login/screenshot_testing/screenshot_tester.h', - 'browser/chromeos/login/screenshot_testing/screenshot_tester.h', - 'browser/chromeos/login/screenshot_testing/screenshot_testing_mixin.cc', - 'browser/chromeos/login/screenshot_testing/screenshot_testing_mixin.h', 'browser/chromeos/login/screenshot_testing/SkDiffPixelsMetric.h', 'browser/chromeos/login/screenshot_testing/SkDiffPixelsMetric_cpu.cpp', 'browser/chromeos/login/screenshot_testing/SkImageDiffer.cpp', 'browser/chromeos/login/screenshot_testing/SkImageDiffer.h', 'browser/chromeos/login/screenshot_testing/SkPMetric.cpp', 'browser/chromeos/login/screenshot_testing/SkPMetric.h', + 'browser/chromeos/login/screenshot_testing/screenshot_tester.cc', + 'browser/chromeos/login/screenshot_testing/screenshot_tester.h', + 'browser/chromeos/login/screenshot_testing/screenshot_tester.h', + 'browser/chromeos/login/screenshot_testing/screenshot_testing_mixin.cc', + 'browser/chromeos/login/screenshot_testing/screenshot_testing_mixin.h', 'browser/chromeos/login/users/wallpaper/wallpaper_manager_browsertest.cc', 'browser/chromeos/login/users/wallpaper/wallpaper_manager_test_utils.cc', 'browser/chromeos/login/users/wallpaper/wallpaper_manager_test_utils.h', @@ -1086,12 +1086,12 @@ 'browser/ui/panels/stacked_panel_browsertest.cc', ], 'chrome_automation_client_lib_sources': [ + '<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/chrome/embedded_automation_extension.cc', + '<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/chrome/embedded_automation_extension.h', '<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/chrome/js.cc', '<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/chrome/js.h', '<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/chrome/user_data_dir.cc', '<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/chrome/user_data_dir.h', - '<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/chrome/embedded_automation_extension.cc', - '<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/chrome/embedded_automation_extension.h', 'test/chromedriver/chrome/adb.h', 'test/chromedriver/chrome/adb_impl.cc', 'test/chromedriver/chrome/adb_impl.h', @@ -1135,8 +1135,8 @@ 'test/chromedriver/chrome/heap_snapshot_taker.h', 'test/chromedriver/chrome/javascript_dialog_manager.cc', 'test/chromedriver/chrome/javascript_dialog_manager.h', - 'test/chromedriver/chrome/log.h', 'test/chromedriver/chrome/log.cc', + 'test/chromedriver/chrome/log.h', 'test/chromedriver/chrome/mobile_device.cc', 'test/chromedriver/chrome/mobile_device.h', 'test/chromedriver/chrome/mobile_device_list.cc', @@ -1181,14 +1181,14 @@ 'app/chrome_dll.rc', 'app/chrome_dll_resource.h', 'app/chrome_version.rc.version', - 'browser/extensions/api/tab_capture/tab_capture_performancetest.cc', 'browser/extensions/api/cast_streaming/performance_test.cc', + 'browser/extensions/api/tab_capture/tab_capture_performancetest.cc', 'browser/extensions/browsertest_util.cc', 'browser/extensions/extension_apitest.cc', 'browser/extensions/extension_browsertest.cc', 'browser/extensions/extension_test_notification_observer.cc', - 'browser/extensions/updater/extension_cache_fake.h', 'browser/extensions/updater/extension_cache_fake.cc', + 'browser/extensions/updater/extension_cache_fake.h', 'test/base/browser_perf_tests_main.cc', 'test/base/chrome_render_view_test.cc', 'test/base/chrome_render_view_test.h', @@ -1197,10 +1197,10 @@ 'test/perf/mach_ports_performancetest.cc', ], 'chrome_driver_lib_sources': [ - '<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/version.cc', - '<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/version.h', '../third_party/webdriver/atoms.cc', '../third_party/webdriver/atoms.h', + '<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/version.cc', + '<(SHARED_INTERMEDIATE_DIR)/chrome/test/chromedriver/version.h', 'common/chrome_constants.cc', 'common/chrome_constants.h', 'test/chromedriver/alert_commands.cc', @@ -1213,10 +1213,10 @@ 'test/chromedriver/chrome/browser_info.h', 'test/chromedriver/chrome_launcher.cc', 'test/chromedriver/chrome_launcher.h', + 'test/chromedriver/command.h', 'test/chromedriver/command_listener.h', 'test/chromedriver/command_listener_proxy.cc', 'test/chromedriver/command_listener_proxy.h', - 'test/chromedriver/command.h', 'test/chromedriver/commands.cc', 'test/chromedriver/commands.h', 'test/chromedriver/element_commands.cc', @@ -1296,8 +1296,6 @@ 'app/chrome_dll.rc', 'app/chrome_dll_resource.h', 'app/chrome_version.rc.version', - 'test/base/browser_tests_main.cc', - 'test/data/resource.rc', 'browser/sync/test/integration/cross_platform_sync_test.cc', 'browser/sync/test/integration/enable_disable_test.cc', 'browser/sync/test/integration/migration_test.cc', @@ -1341,6 +1339,8 @@ 'browser/sync/test/integration/two_client_themes_sync_test.cc', 'browser/sync/test/integration/two_client_typed_urls_sync_test.cc', 'browser/sync/test/integration/two_client_wifi_credentials_sync_test.cc', + 'test/base/browser_tests_main.cc', + 'test/data/resource.rc', ], 'test_support_sync_integration_sources': [ 'browser/sync/test/integration/apps_helper.cc', @@ -1365,12 +1365,12 @@ 'browser/sync/test/integration/migration_watcher.h', 'browser/sync/test/integration/multi_client_status_change_checker.cc', 'browser/sync/test/integration/multi_client_status_change_checker.h', - 'browser/sync/test/integration/passwords_helper.cc', - 'browser/sync/test/integration/passwords_helper.h', 'browser/sync/test/integration/p2p_invalidation_forwarder.cc', 'browser/sync/test/integration/p2p_invalidation_forwarder.h', 'browser/sync/test/integration/p2p_sync_refresher.cc', 'browser/sync/test/integration/p2p_sync_refresher.h', + 'browser/sync/test/integration/passwords_helper.cc', + 'browser/sync/test/integration/passwords_helper.h', 'browser/sync/test/integration/preferences_helper.cc', 'browser/sync/test/integration/preferences_helper.h', 'browser/sync/test/integration/profile_sync_service_harness.cc', @@ -1421,10 +1421,10 @@ 'browser/sync/test/integration/performance/bookmarks_sync_perf_test.cc', 'browser/sync/test/integration/performance/dictionary_sync_perf_test.cc', 'browser/sync/test/integration/performance/extensions_sync_perf_test.cc', - 'browser/sync/test/integration/performance/sync_timing_helper.cc', - 'browser/sync/test/integration/performance/sync_timing_helper.h', 'browser/sync/test/integration/performance/passwords_sync_perf_test.cc', 'browser/sync/test/integration/performance/sessions_sync_perf_test.cc', + 'browser/sync/test/integration/performance/sync_timing_helper.cc', + 'browser/sync/test/integration/performance/sync_timing_helper.h', 'browser/sync/test/integration/performance/typed_urls_sync_perf_test.cc', 'test/base/browser_perf_tests_main.cc', 'test/data/resource.rc', @@ -2901,9 +2901,9 @@ ], 'sources': [ # Note: Sources list duplicated in GN build. + '../content/browser/net/sqlite_persistent_cookie_store_perftest.cc', 'test/perf/perftests.cc', 'test/perf/url_parse_perftest.cc', - '../content/browser/net/sqlite_persistent_cookie_store_perftest.cc', ], 'conditions': [ ['use_x11==1', { @@ -3222,8 +3222,8 @@ 'utility', ], 'sources': [ - 'tools/service_discovery_sniffer/service_discovery_sniffer.h', 'tools/service_discovery_sniffer/service_discovery_sniffer.cc', + 'tools/service_discovery_sniffer/service_discovery_sniffer.h', ], 'conditions': [ ['enable_webrtc==1', { diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi index 38277de..9244502 100644 --- a/chrome/chrome_tests_unit.gypi +++ b/chrome/chrome_tests_unit.gypi @@ -46,9 +46,9 @@ 'browser/browsing_data/browsing_data_indexed_db_helper_unittest.cc', 'browser/browsing_data/browsing_data_local_storage_helper_unittest.cc', 'browser/browsing_data/browsing_data_quota_helper_unittest.cc', - 'browser/browsing_data/browsing_data_remover_unittest.cc', 'browser/browsing_data/browsing_data_remover_test_util.cc', 'browser/browsing_data/browsing_data_remover_test_util.h', + 'browser/browsing_data/browsing_data_remover_unittest.cc', 'browser/browsing_data/browsing_data_service_worker_helper_unittest.cc', 'browser/browsing_data/cookies_tree_model_unittest.cc', 'browser/chrome_browser_application_mac_unittest.mm', @@ -117,7 +117,6 @@ 'browser/history/typed_url_syncable_service_unittest.cc', 'browser/history/web_history_service_unittest.cc', 'browser/image_holder_unittest.cc', - 'browser/internal_auth_unittest.cc', 'browser/install_verification/win/imported_module_verification_unittest.cc', 'browser/install_verification/win/loaded_module_verification_unittest.cc', 'browser/install_verification/win/loaded_modules_snapshot_unittest.cc', @@ -126,6 +125,7 @@ 'browser/install_verification/win/module_list_unittest.cc', 'browser/install_verification/win/module_verification_test.cc', 'browser/install_verification/win/module_verification_test.h', + 'browser/internal_auth_unittest.cc', 'browser/invalidation/invalidator_storage_unittest.cc', 'browser/io_thread_unittest.cc', 'browser/logging_chrome_unittest.cc', @@ -133,11 +133,11 @@ 'browser/media/native_desktop_media_list_unittest.cc', 'browser/metrics/chrome_metrics_service_accessor_unittest.cc', 'browser/metrics/cloned_install_detector_unittest.cc', + 'browser/metrics/rappor/sampling_unittest.cc', 'browser/metrics/signin_status_metrics_provider_chromeos_unittest.cc', 'browser/metrics/signin_status_metrics_provider_unittest.cc', - 'browser/metrics/rappor/sampling_unittest.cc', - 'browser/metrics/thread_watcher_unittest.cc', 'browser/metrics/thread_watcher_android_unittest.cc', + 'browser/metrics/thread_watcher_unittest.cc', 'browser/metrics/time_ticks_experiment_unittest.cc', 'browser/metrics/variations/generated_resources_map_lookup_unittest.cc', 'browser/metrics/variations/variations_request_scheduler_mobile_unittest.cc', @@ -171,8 +171,8 @@ 'browser/predictors/autocomplete_action_predictor_table_unittest.cc', 'browser/predictors/autocomplete_action_predictor_unittest.cc', 'browser/predictors/resource_prefetch_common_unittest.cc', - 'browser/predictors/resource_prefetch_predictor_unittest.cc', 'browser/predictors/resource_prefetch_predictor_tables_unittest.cc', + 'browser/predictors/resource_prefetch_predictor_unittest.cc', 'browser/predictors/resource_prefetcher_unittest.cc', 'browser/prefs/chrome_pref_service_unittest.cc', 'browser/prefs/command_line_pref_store_unittest.cc', @@ -200,10 +200,10 @@ 'browser/process_info_snapshot_mac_unittest.cc', 'browser/profiles/file_path_verifier_win_unittest.cc', 'browser/profiles/gaia_info_update_service_unittest.cc', + 'browser/profiles/profile_avatar_icon_util_unittest.cc', 'browser/profiles/profile_downloader_unittest.cc', 'browser/profiles/profile_info_cache_unittest.cc', 'browser/profiles/profile_info_cache_unittest.h', - 'browser/profiles/profile_avatar_icon_util_unittest.cc', 'browser/profiles/profile_manager_unittest.cc', 'browser/profiles/profile_shortcut_manager_unittest_win.cc', 'browser/renderer_context_menu/render_view_context_menu_test_util.cc', @@ -533,8 +533,8 @@ 'browser/upload_list_unittest.cc', 'browser/web_resource/promo_resource_service_mobile_ntp_unittest.cc', 'browser/web_resource/promo_resource_service_unittest.cc', - 'common/chrome_paths_unittest.cc', 'common/chrome_content_client_unittest.cc', + 'common/chrome_paths_unittest.cc', 'common/cloud_print/cloud_print_helpers_unittest.cc', 'common/crash_keys_unittest.cc', 'common/favicon/favicon_url_parser_unittest.cc', @@ -592,12 +592,12 @@ '../tools/json_schema_compiler/test/choices_unittest.cc', '../tools/json_schema_compiler/test/crossref_unittest.cc', '../tools/json_schema_compiler/test/enums_unittest.cc', + '../tools/json_schema_compiler/test/error_generation_unittest.cc', '../tools/json_schema_compiler/test/functions_as_parameters_unittest.cc', '../tools/json_schema_compiler/test/functions_on_types_unittest.cc', '../tools/json_schema_compiler/test/idl_schemas_unittest.cc', '../tools/json_schema_compiler/test/objects_unittest.cc', '../tools/json_schema_compiler/test/simple_api_unittest.cc', - '../tools/json_schema_compiler/test/error_generation_unittest.cc', '../ui/webui/resources/js/cr.js', ], 'chrome_unit_tests_one_click_signin_sources': [ @@ -661,11 +661,11 @@ 'browser/extensions/api/cookies/cookies_unittest.cc', 'browser/extensions/api/copresence/copresence_api_unittest.cc', 'browser/extensions/api/cryptotoken_private/cryptotoken_private_api_unittest.cc', + 'browser/extensions/api/declarative/rules_registry_service_unittest.cc', + 'browser/extensions/api/declarative/rules_registry_with_cache_unittest.cc', 'browser/extensions/api/declarative_content/chrome_content_rules_registry_unittest.cc', 'browser/extensions/api/declarative_content/content_action_unittest.cc', 'browser/extensions/api/declarative_content/content_condition_unittest.cc', - 'browser/extensions/api/declarative/rules_registry_service_unittest.cc', - 'browser/extensions/api/declarative/rules_registry_with_cache_unittest.cc', 'browser/extensions/api/declarative_webrequest/webrequest_action_unittest.cc', 'browser/extensions/api/declarative_webrequest/webrequest_rules_registry_unittest.cc', 'browser/extensions/api/device_permissions_manager_unittest.cc', @@ -699,10 +699,10 @@ 'browser/extensions/api/signed_in_devices/signed_in_devices_api_unittest.cc', 'browser/extensions/api/signed_in_devices/signed_in_devices_manager_unittest.cc', 'browser/extensions/api/socket/socket_api_unittest.cc', - 'browser/extensions/api/sockets_tcp_server/sockets_tcp_server_api_unittest.cc', 'browser/extensions/api/socket/tcp_socket_unittest.cc', 'browser/extensions/api/socket/tls_socket_unittest.cc', 'browser/extensions/api/socket/udp_socket_unittest.cc', + 'browser/extensions/api/sockets_tcp_server/sockets_tcp_server_api_unittest.cc', 'browser/extensions/api/storage/settings_sync_unittest.cc', 'browser/extensions/api/streams_private/streams_private_manifest_unittest.cc', 'browser/extensions/api/web_navigation/frame_navigation_state_unittest.cc', @@ -791,6 +791,7 @@ 'browser/signin/easy_unlock_auth_attempt_unittest.cc', 'browser/signin/easy_unlock_screenlock_state_handler_unittest.cc', 'browser/signin/easy_unlock_service_unittest_chromeos.cc', + 'browser/sync/glue/extensions_activity_monitor_unittest.cc', 'browser/sync_file_system/drive_backend/callback_helper_unittest.cc', 'browser/sync_file_system/drive_backend/callback_tracker_unittest.cc', 'browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc', @@ -838,12 +839,11 @@ 'browser/sync_file_system/mock_remote_file_sync_service.cc', 'browser/sync_file_system/mock_remote_file_sync_service.h', 'browser/sync_file_system/subtree_set_unittest.cc', - 'browser/sync_file_system/syncable_file_system_util_unittest.cc', 'browser/sync_file_system/sync_file_system_service_unittest.cc', 'browser/sync_file_system/sync_file_system_test_util.cc', 'browser/sync_file_system/sync_file_system_test_util.h', 'browser/sync_file_system/sync_process_runner_unittest.cc', - 'browser/sync/glue/extensions_activity_monitor_unittest.cc', + 'browser/sync_file_system/syncable_file_system_util_unittest.cc', 'browser/web_applications/web_app_mac_unittest.mm', 'browser/web_applications/web_app_unittest.cc', 'common/extensions/api/commands/commands_manifest_unittest.cc', @@ -856,8 +856,8 @@ 'common/extensions/command_unittest.cc', 'common/extensions/extension_icon_set_unittest.cc', 'common/extensions/extension_unittest.cc', - 'common/extensions/features/chrome_channel_feature_filter_unittest.cc', 'common/extensions/feature_switch_unittest.cc', + 'common/extensions/features/chrome_channel_feature_filter_unittest.cc', 'common/extensions/manifest_handlers/automation_unittest.cc', 'common/extensions/manifest_handlers/content_scripts_manifest_unittest.cc', 'common/extensions/manifest_handlers/exclude_matches_manifest_unittest.cc', @@ -878,8 +878,8 @@ 'common/extensions/manifest_tests/extension_manifests_initvalue_unittest.cc', 'common/extensions/manifest_tests/extension_manifests_isolatedapp_unittest.cc', 'common/extensions/manifest_tests/extension_manifests_kiosk_unittest.cc', - 'common/extensions/manifest_tests/extension_manifests_launcher_page_unittest.cc', 'common/extensions/manifest_tests/extension_manifests_launch_unittest.cc', + 'common/extensions/manifest_tests/extension_manifests_launcher_page_unittest.cc', 'common/extensions/manifest_tests/extension_manifests_manifest_version_unittest.cc', 'common/extensions/manifest_tests/extension_manifests_offline_unittest.cc', 'common/extensions/manifest_tests/extension_manifests_old_unittest.cc', @@ -899,8 +899,8 @@ 'common/extensions/manifest_unittest.cc', 'common/extensions/permissions/chrome_permission_message_provider_unittest.cc', 'common/extensions/permissions/media_galleries_permission_unittest.cc', - 'common/extensions/permissions/permissions_data_unittest.cc', 'common/extensions/permissions/permission_set_unittest.cc', + 'common/extensions/permissions/permissions_data_unittest.cc', 'common/extensions/permissions/settings_override_permission_unittest.cc', 'common/extensions/sync_type_unittest.cc', 'common/extensions/update_manifest_unittest.cc', @@ -923,9 +923,9 @@ # Ash implies the app list is enabled (only disabled on mobile). 'browser/ui/app_list/search/app_search_provider_unittest.cc', 'browser/ui/app_list/search/history_unittest.cc', + 'browser/ui/ash/accessibility/ax_tree_source_ash_unittest.cc', 'browser/ui/ash/chrome_screenshot_grabber_unittest.cc', 'browser/ui/ash/ime_controller_chromeos_unittest.cc', - 'browser/ui/ash/accessibility/ax_tree_source_ash_unittest.cc', 'browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc', 'browser/ui/ash/launcher/launcher_context_menu_unittest.cc', 'browser/ui/ash/multi_user/multi_user_context_menu_chromeos_unittest.cc', @@ -1117,8 +1117,6 @@ 'browser/chromeos/drive/fake_file_system_unittest.cc', 'browser/chromeos/drive/fake_free_disk_space_getter.cc', 'browser/chromeos/drive/fake_free_disk_space_getter.h', - 'browser/chromeos/drive/fileapi/fileapi_worker_unittest.cc', - 'browser/chromeos/drive/fileapi/webkit_file_stream_reader_impl_unittest.cc', 'browser/chromeos/drive/file_cache_unittest.cc', 'browser/chromeos/drive/file_change_unittest.cc', 'browser/chromeos/drive/file_system/copy_operation_unittest.cc', @@ -1138,6 +1136,8 @@ 'browser/chromeos/drive/file_system_util_unittest.cc', 'browser/chromeos/drive/file_task_executor_unittest.cc', 'browser/chromeos/drive/file_write_watcher_unittest.cc', + 'browser/chromeos/drive/fileapi/fileapi_worker_unittest.cc', + 'browser/chromeos/drive/fileapi/webkit_file_stream_reader_impl_unittest.cc', 'browser/chromeos/drive/job_queue_unittest.cc', 'browser/chromeos/drive/job_scheduler_unittest.cc', 'browser/chromeos/drive/local_file_reader_unittest.cc', @@ -1146,10 +1146,10 @@ 'browser/chromeos/drive/resource_metadata_storage_unittest.cc', 'browser/chromeos/drive/resource_metadata_unittest.cc', 'browser/chromeos/drive/search_metadata_unittest.cc', - 'browser/chromeos/drive/sync_client_unittest.cc', 'browser/chromeos/drive/sync/entry_revert_performer_unittest.cc', 'browser/chromeos/drive/sync/entry_update_performer_unittest.cc', 'browser/chromeos/drive/sync/remove_performer_unittest.cc', + 'browser/chromeos/drive/sync_client_unittest.cc', 'browser/chromeos/drive/test_util.cc', 'browser/chromeos/drive/test_util.h', 'browser/chromeos/drive/write_on_cache_file_unittest.cc', @@ -1162,13 +1162,9 @@ 'browser/chromeos/extensions/file_manager/device_event_router_unittest.cc', 'browser/chromeos/extensions/wallpaper_private_api_unittest.cc', 'browser/chromeos/external_metrics_unittest.cc', - 'browser/chromeos/fileapi/external_file_url_request_job_unittest.cc', - 'browser/chromeos/fileapi/external_file_url_util_unittest.cc', - 'browser/chromeos/fileapi/file_access_permissions_unittest.cc', - 'browser/chromeos/fileapi/file_system_backend_unittest.cc', - 'browser/chromeos/file_manager/fileapi_util_unittest.cc', 'browser/chromeos/file_manager/file_tasks_unittest.cc', 'browser/chromeos/file_manager/file_watcher_unittest.cc', + 'browser/chromeos/file_manager/fileapi_util_unittest.cc', 'browser/chromeos/file_manager/path_util_unittest.cc', 'browser/chromeos/file_manager/url_util_unittest.cc', 'browser/chromeos/file_manager/volume_manager_unittest.cc', @@ -1204,6 +1200,10 @@ 'browser/chromeos/file_system_provider/request_manager_unittest.cc', 'browser/chromeos/file_system_provider/service_unittest.cc', 'browser/chromeos/file_system_provider/throttled_file_system_unittest.cc', + 'browser/chromeos/fileapi/external_file_url_request_job_unittest.cc', + 'browser/chromeos/fileapi/external_file_url_util_unittest.cc', + 'browser/chromeos/fileapi/file_access_permissions_unittest.cc', + 'browser/chromeos/fileapi/file_system_backend_unittest.cc', 'browser/chromeos/input_method/browser_state_monitor_unittest.cc', 'browser/chromeos/input_method/input_method_configuration_unittest.cc', 'browser/chromeos/input_method/input_method_engine_unittest.cc', @@ -1225,8 +1225,8 @@ 'browser/chromeos/login/users/user_manager_unittest.cc', 'browser/chromeos/login/users/wallpaper/wallpaper_manager_unittest.cc', 'browser/chromeos/memory/oom_priority_manager_unittest.cc', - 'browser/chromeos/mobile_config_unittest.cc', 'browser/chromeos/mobile/mobile_activator_unittest.cc', + 'browser/chromeos/mobile_config_unittest.cc', 'browser/chromeos/net/cert_verify_proc_chromeos_unittest.cc', 'browser/chromeos/net/network_portal_detector_impl_unittest.cc', 'browser/chromeos/net/network_portal_notification_controller_unittest.cc', @@ -1310,8 +1310,8 @@ # Views implies app list is enabled (only disabled on mobile). 'browser/ui/views/app_list/linux/app_list_linux_unittest.cc', 'browser/ui/views/app_list/win/app_list_win_unittest.cc', - 'browser/ui/views/apps/app_info_dialog/app_info_permissions_panel_unittest.cc', 'browser/ui/views/apps/app_info_dialog/app_info_dialog_views_unittest.cc', + 'browser/ui/views/apps/app_info_dialog/app_info_permissions_panel_unittest.cc', 'browser/ui/views/apps/shaped_app_window_targeter_unittest.cc', 'browser/ui/views/autofill/autofill_dialog_views_unittest.cc', 'browser/ui/views/bookmarks/bookmark_bar_view_unittest.cc', @@ -1391,8 +1391,8 @@ # ContentProvider. 'browser/bookmarks/bookmark_html_writer_unittest.cc', 'browser/browser_commands_unittest.cc', - 'browser/diagnostics/diagnostics_model_unittest.cc', 'browser/diagnostics/diagnostics_controller_unittest.cc', + 'browser/diagnostics/diagnostics_model_unittest.cc', 'browser/download/download_shelf_unittest.cc', 'browser/first_run/first_run_unittest.cc', 'browser/font_family_cache_unittest.cc', @@ -1682,10 +1682,10 @@ 'browser/ui/passwords/manage_passwords_ui_controller_mock.h', 'browser/ui/pdf/pdf_browsertest_base.cc', 'browser/ui/pdf/pdf_browsertest_base.h', - 'browser/ui/toolbar/test_toolbar_action_view_controller.cc', - 'browser/ui/toolbar/test_toolbar_action_view_controller.h', 'browser/ui/test/test_confirm_bubble_model.cc', 'browser/ui/test/test_confirm_bubble_model.h', + 'browser/ui/toolbar/test_toolbar_action_view_controller.cc', + 'browser/ui/toolbar/test_toolbar_action_view_controller.h', 'browser/ui/views/find_bar_host_unittest_util_views.cc', 'browser/ui/website_settings/mock_permission_bubble_request.cc', 'browser/ui/website_settings/mock_permission_bubble_request.h', @@ -1728,8 +1728,8 @@ 'test/base/test_switches.h', 'test/base/testing_browser_process.cc', 'test/base/testing_browser_process.h', - 'test/base/testing_browser_process_platform_part.h', 'test/base/testing_browser_process_platform_part.cc', + 'test/base/testing_browser_process_platform_part.h', 'test/base/testing_io_thread_state.cc', 'test/base/testing_io_thread_state.h', 'test/base/testing_pref_service_syncable.cc', @@ -1814,20 +1814,20 @@ 'browser/chromeos/login/screens/mock_device_disabled_screen_actor.h', 'browser/chromeos/login/session/user_session_manager_test_api.cc', 'browser/chromeos/login/session/user_session_manager_test_api.h', - 'browser/chromeos/login/test/oobe_screen_waiter.cc', - 'browser/chromeos/login/test/oobe_screen_waiter.h', 'browser/chromeos/login/test/js_checker.cc', 'browser/chromeos/login/test/js_checker.h', + 'browser/chromeos/login/test/oobe_screen_waiter.cc', + 'browser/chromeos/login/test/oobe_screen_waiter.h', 'browser/chromeos/login/ui/mock_login_display.cc', 'browser/chromeos/login/ui/mock_login_display.h', 'browser/chromeos/login/ui/mock_login_display_host.cc', 'browser/chromeos/login/ui/mock_login_display_host.h', 'browser/chromeos/login/users/avatar/mock_user_image_manager.cc', 'browser/chromeos/login/users/avatar/mock_user_image_manager.h', - 'browser/chromeos/login/users/fake_supervised_user_manager.cc', - 'browser/chromeos/login/users/fake_supervised_user_manager.h', 'browser/chromeos/login/users/fake_chrome_user_manager.cc', 'browser/chromeos/login/users/fake_chrome_user_manager.h', + 'browser/chromeos/login/users/fake_supervised_user_manager.cc', + 'browser/chromeos/login/users/fake_supervised_user_manager.h', 'browser/chromeos/login/users/mock_user_manager.cc', 'browser/chromeos/login/users/mock_user_manager.h', 'browser/chromeos/net/network_portal_detector_test_utils.cc', @@ -2294,8 +2294,8 @@ ['OS == "android"', { 'sources!': [ # Android doesn't support download feedbacks. - 'browser/safe_browsing/download_feedback_unittest.cc', 'browser/safe_browsing/download_feedback_service_unittest.cc', + 'browser/safe_browsing/download_feedback_unittest.cc', 'browser/safe_browsing/download_protection_service_unittest.cc', 'browser/safe_browsing/two_phase_uploader_unittest.cc', ], @@ -2403,8 +2403,8 @@ 'sources': [ '<@(chrome_unit_tests_mac_sources)' ], 'sources!': [ 'browser/ui/tests/ui_gfx_image_unittest.cc', - 'tools/convert_dict/convert_dict_unittest.cc', 'renderer/spellchecker/spellcheck_provider_hunspell_unittest.cc', + 'tools/convert_dict/convert_dict_unittest.cc', ], # TODO(mark): We really want this for all non-static library targets, # but when we tried to pull it up to the common.gypi level, it broke @@ -2611,9 +2611,9 @@ 'app/chrome_watcher_client_win.cc', 'app/chrome_watcher_command_line_unittest_win.cc', 'app/chrome_watcher_command_line_win.cc', + 'app/delay_load_hook_unittest_win.cc', 'app/delay_load_hook_win.cc', 'app/delay_load_hook_win.h', - 'app/delay_load_hook_unittest_win.cc', 'app/signature_validator_win.cc', 'app/signature_validator_win.h', 'app/signature_validator_win_unittest.cc', diff --git a/chrome/chrome_utility.gypi b/chrome/chrome_utility.gypi index eb9e7c6..d986e14 100644 --- a/chrome/chrome_utility.gypi +++ b/chrome/chrome_utility.gypi @@ -13,14 +13,14 @@ 'utility/cloud_print/bitmap_image.h', 'utility/cloud_print/pwg_encoder.cc', 'utility/cloud_print/pwg_encoder.h', + 'utility/font_cache_handler_win.cc', + 'utility/font_cache_handler_win.h', 'utility/local_discovery/service_discovery_message_handler.cc', 'utility/local_discovery/service_discovery_message_handler.h', 'utility/printing_handler.cc', 'utility/printing_handler.h', 'utility/shell_handler_win.cc', 'utility/shell_handler_win.h', - 'utility/font_cache_handler_win.cc', - 'utility/font_cache_handler_win.h', 'utility/utility_message_handler.h', ], 'chrome_utility_extensions_sources': [ diff --git a/tools/sort_sources.py b/tools/sort_sources.py index b2bacef..f7e86b5 100755 --- a/tools/sort_sources.py +++ b/tools/sort_sources.py @@ -3,7 +3,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -"""Given a GYP/GN filename as an argument, sort C++ source files in that file. +"""Given a GYP/GN filename, sort C-ish source files in that file. Shows a diff and prompts for confirmation before doing the deed. Works great with tools/git/for-all-touched-files.py. @@ -26,7 +26,7 @@ def SortSources(original_lines): Returns: Lines of the sorted content as a list of strings. - The algorithm is fairly naive. The code tries to find a list of C++ source + The algorithm is fairly naive. The code tries to find a list of C-ish source file names by a simple regex, then sort them. The code does not try to understand the syntax of the build files, hence there are many cases that the code cannot handle correctly (ex. comments within a list of source file @@ -36,7 +36,7 @@ def SortSources(original_lines): output_lines = [] sources = [] for line in original_lines: - if re.search(r'^\s+[\'"].*\.(c|cc|cpp|h)[\'"],$', line): + if re.search(r'^\s+[\'"].*\.(c|cc|cpp|h|mm|rc)[\'"],$', line): sources.append(line) else: if sources: |