From e342a0a0ee51ddfbcf60c4dd5c579de3058fa65a Mon Sep 17 00:00:00 2001 From: satorux Date: Sun, 15 Feb 2015 23:56:19 -0800 Subject: Sort GYP and GN files under extensions For tools/sort_sources.py to be useful, existing GYP and GN files should be sorted. BUG=456014 TEST=everything should build as before Review URL: https://codereview.chromium.org/931483003 Cr-Commit-Position: refs/heads/master@{#316437} --- extensions/extensions.gypi | 52 ++++++++++++++++++++-------------------- extensions/extensions_tests.gypi | 10 ++++---- extensions/shell/app_shell.gypi | 6 ++--- 3 files changed, 34 insertions(+), 34 deletions(-) (limited to 'extensions') diff --git a/extensions/extensions.gypi b/extensions/extensions.gypi index e829c34..f027d40 100644 --- a/extensions/extensions.gypi +++ b/extensions/extensions.gypi @@ -30,8 +30,6 @@ 'common/cast/cast_cert_validator.h', 'common/common_manifest_handlers.cc', 'common/common_manifest_handlers.h', - 'common/host_id.cc', - 'common/host_id.h', 'common/csp_validator.cc', 'common/csp_validator.h', 'common/dom_action_types.h', @@ -74,6 +72,8 @@ 'common/features/api_feature.h', 'common/features/base_feature_provider.cc', 'common/features/base_feature_provider.h', + 'common/features/behavior_feature.cc', + 'common/features/behavior_feature.h', 'common/features/complex_feature.cc', 'common/features/complex_feature.h', 'common/features/feature.cc', @@ -90,13 +90,13 @@ 'common/features/simple_feature.h', 'common/features/simple_feature_filter.cc', 'common/features/simple_feature_filter.h', - 'common/features/behavior_feature.cc', - 'common/features/behavior_feature.h', 'common/file_util.cc', 'common/file_util.h', 'common/guest_view/guest_view_constants.cc', 'common/guest_view/guest_view_constants.h', 'common/guest_view_messages.h', + 'common/host_id.cc', + 'common/host_id.h', 'common/image_util.cc', 'common/image_util.h', 'common/install_warning.cc', @@ -230,10 +230,10 @@ # Android build still compiles. See conditions below. 'browser/api/activity_log/web_request_constants.cc', 'browser/api/activity_log/web_request_constants.h', - 'browser/api/alarms/alarms_api.cc', - 'browser/api/alarms/alarms_api.h', 'browser/api/alarms/alarm_manager.cc', 'browser/api/alarms/alarm_manager.h', + 'browser/api/alarms/alarms_api.cc', + 'browser/api/alarms/alarms_api.h', 'browser/api/api_resource.cc', 'browser/api/api_resource.h', 'browser/api/api_resource_manager.h', @@ -292,18 +292,18 @@ 'browser/api/cast_channel/cast_message_util.h', 'browser/api/cast_channel/cast_socket.cc', 'browser/api/cast_channel/cast_socket.h', - 'browser/api/cast_channel/cast_transport.h', 'browser/api/cast_channel/cast_transport.cc', + 'browser/api/cast_channel/cast_transport.h', 'browser/api/cast_channel/keep_alive_delegate.cc', 'browser/api/cast_channel/keep_alive_delegate.h', 'browser/api/cast_channel/logger.cc', 'browser/api/cast_channel/logger.h', 'browser/api/cast_channel/logger_util.cc', 'browser/api/cast_channel/logger_util.h', - 'browser/api/declarative/deduping_factory.h', 'browser/api/declarative/declarative_api.cc', 'browser/api/declarative/declarative_api.h', 'browser/api/declarative/declarative_rule.h', + 'browser/api/declarative/deduping_factory.h', 'browser/api/declarative/rules_cache_delegate.cc', 'browser/api/declarative/rules_cache_delegate.h', 'browser/api/declarative/rules_registry.cc', @@ -362,9 +362,9 @@ 'browser/api/idle/idle_manager_factory.h', 'browser/api/management/management_api.cc', 'browser/api/management/management_api.h', - 'browser/api/management/management_api_delegate.h', 'browser/api/management/management_api_constants.cc', 'browser/api/management/management_api_constants.h', + 'browser/api/management/management_api_delegate.h', 'browser/api/messaging/native_message_host.cc', 'browser/api/mime_handler_private/mime_handler_private.cc', 'browser/api/mime_handler_private/mime_handler_private.h', @@ -471,13 +471,13 @@ 'browser/api/test/test_api.h', 'browser/api/usb/usb_api.cc', 'browser/api/usb/usb_api.h', - 'browser/api/usb/usb_event_router.cc', - 'browser/api/usb/usb_event_router.h', 'browser/api/usb/usb_device_resource.cc', 'browser/api/usb/usb_device_resource.h', + 'browser/api/usb/usb_event_router.cc', + 'browser/api/usb/usb_event_router.h', + 'browser/api/virtual_keyboard_private/virtual_keyboard_delegate.h', 'browser/api/virtual_keyboard_private/virtual_keyboard_private_api.cc', 'browser/api/virtual_keyboard_private/virtual_keyboard_private_api.h', - 'browser/api/virtual_keyboard_private/virtual_keyboard_delegate.h', 'browser/api/web_request/form_data_parser.cc', 'browser/api/web_request/form_data_parser.h', 'browser/api/web_request/upload_data_presenter.cc', @@ -505,14 +505,14 @@ 'browser/app_window/app_web_contents_helper.h', 'browser/app_window/app_window.cc', 'browser/app_window/app_window.h', + 'browser/app_window/app_window_client.cc', + 'browser/app_window/app_window_client.h', 'browser/app_window/app_window_contents.cc', 'browser/app_window/app_window_contents.h', 'browser/app_window/app_window_geometry_cache.cc', 'browser/app_window/app_window_geometry_cache.h', 'browser/app_window/app_window_registry.cc', 'browser/app_window/app_window_registry.h', - 'browser/app_window/app_window_client.cc', - 'browser/app_window/app_window_client.h', 'browser/app_window/native_app_window.h', 'browser/app_window/size_constraints.cc', 'browser/app_window/size_constraints.h', @@ -546,10 +546,6 @@ 'browser/event_listener_map.h', 'browser/event_router.cc', 'browser/event_router.h', - 'browser/extension_host.cc', - 'browser/extension_host.h', - 'browser/extension_host_delegate.h', - 'browser/extension_host_observer.h', 'browser/extension_error.cc', 'browser/extension_error.h', 'browser/extension_function.cc', @@ -560,6 +556,10 @@ 'browser/extension_function_registry.h', 'browser/extension_function_util.cc', 'browser/extension_function_util.h', + 'browser/extension_host.cc', + 'browser/extension_host.h', + 'browser/extension_host_delegate.h', + 'browser/extension_host_observer.h', 'browser/extension_icon_image.cc', 'browser/extension_icon_image.h', 'browser/extension_message_filter.cc', @@ -567,9 +567,9 @@ 'browser/extension_pref_store.cc', 'browser/extension_pref_store.h', 'browser/extension_pref_value_map.cc', + 'browser/extension_pref_value_map.h', 'browser/extension_pref_value_map_factory.cc', 'browser/extension_pref_value_map_factory.h', - 'browser/extension_pref_value_map.h', 'browser/extension_prefs.cc', 'browser/extension_prefs.h', 'browser/extension_prefs_factory.cc', @@ -621,22 +621,22 @@ 'browser/guest_view/extension_view/extension_view_guest.h', 'browser/guest_view/extension_view/extension_view_guest_delegate.cc', 'browser/guest_view/extension_view/extension_view_guest_delegate.h', + 'browser/guest_view/guest_view.h', 'browser/guest_view/guest_view_base.cc', 'browser/guest_view/guest_view_base.h', - 'browser/guest_view/guest_view_manager_factory.h', 'browser/guest_view/guest_view_manager.cc', 'browser/guest_view/guest_view_manager.h', + 'browser/guest_view/guest_view_manager_factory.h', 'browser/guest_view/guest_view_message_filter.cc', 'browser/guest_view/guest_view_message_filter.h', - 'browser/guest_view/guest_view.h', 'browser/guest_view/mime_handler_view/mime_handler_stream_manager.cc', 'browser/guest_view/mime_handler_view/mime_handler_stream_manager.h', 'browser/guest_view/mime_handler_view/mime_handler_view_constants.cc', 'browser/guest_view/mime_handler_view/mime_handler_view_constants.h', - 'browser/guest_view/mime_handler_view/mime_handler_view_guest_delegate.cc', - 'browser/guest_view/mime_handler_view/mime_handler_view_guest_delegate.h', 'browser/guest_view/mime_handler_view/mime_handler_view_guest.cc', 'browser/guest_view/mime_handler_view/mime_handler_view_guest.h', + 'browser/guest_view/mime_handler_view/mime_handler_view_guest_delegate.cc', + 'browser/guest_view/mime_handler_view/mime_handler_view_guest_delegate.h', 'browser/guest_view/surface_worker/surface_worker_constants.cc', 'browser/guest_view/surface_worker/surface_worker_constants.h', 'browser/guest_view/surface_worker/surface_worker_guest.cc', @@ -650,11 +650,11 @@ 'browser/guest_view/web_view/web_view_guest.cc', 'browser/guest_view/web_view/web_view_guest.h', 'browser/guest_view/web_view/web_view_guest_delegate.h', - 'browser/guest_view/web_view/web_view_permission_types.h', 'browser/guest_view/web_view/web_view_permission_helper.cc', 'browser/guest_view/web_view/web_view_permission_helper.h', 'browser/guest_view/web_view/web_view_permission_helper_delegate.cc', 'browser/guest_view/web_view/web_view_permission_helper_delegate.h', + 'browser/guest_view/web_view/web_view_permission_types.h', 'browser/guest_view/web_view/web_view_renderer_state.cc', 'browser/guest_view/web_view/web_view_renderer_state.h', 'browser/image_loader.cc', @@ -784,11 +784,11 @@ ], 'extensions_browser_sources_linux_nonchromeos': [ 'browser/api/audio/audio_service_linux.cc', + 'browser/api/networking_private/network_config_dbus_constants_linux.cc', + 'browser/api/networking_private/network_config_dbus_constants_linux.h', 'browser/api/networking_private/networking_private_event_router_nonchromeos.cc', 'browser/api/networking_private/networking_private_linux.cc', 'browser/api/networking_private/networking_private_linux.h', - 'browser/api/networking_private/network_config_dbus_constants_linux.cc', - 'browser/api/networking_private/network_config_dbus_constants_linux.h', ], 'extensions_renderer_sources': [ 'renderer/activity_log_converter_strategy.cc', diff --git a/extensions/extensions_tests.gypi b/extensions/extensions_tests.gypi index a0e9fd6..479f0b6 100644 --- a/extensions/extensions_tests.gypi +++ b/extensions/extensions_tests.gypi @@ -24,8 +24,8 @@ 'browser/api/system_storage/system_storage_eject_apitest.cc', 'browser/api/usb/usb_apitest.cc', 'browser/guest_view/app_view/app_view_apitest.cc', - 'browser/guest_view/web_view/web_view_apitest.h', 'browser/guest_view/web_view/web_view_apitest.cc', + 'browser/guest_view/web_view/web_view_apitest.h', 'browser/guest_view/web_view/web_view_media_access_apitest.cc', 'browser/updater/update_service_browsertest.cc', 'shell/browser/geolocation/geolocation_apitest.cc', @@ -53,8 +53,8 @@ 'browser/api/declarative/declarative_rule_unittest.cc', 'browser/api/declarative/deduping_factory_unittest.cc', 'browser/api/declarative/rules_registry_unittest.cc', - 'browser/api/declarative_webrequest/webrequest_condition_unittest.cc', 'browser/api/declarative_webrequest/webrequest_condition_attribute_unittest.cc', + 'browser/api/declarative_webrequest/webrequest_condition_unittest.cc', 'browser/api/document_scan/document_scan_api_unittest.cc', 'browser/api/document_scan/document_scan_interface_chromeos_unittest.cc', 'browser/api/document_scan/mock_document_scan_interface.cc', @@ -73,9 +73,9 @@ 'browser/app_window/app_window_geometry_cache_unittest.cc', 'browser/computed_hashes_unittest.cc', 'browser/content_hash_tree_unittest.cc', + 'browser/error_map_unittest.cc', 'browser/event_listener_map_unittest.cc', 'browser/event_router_unittest.cc', - 'browser/error_map_unittest.cc', 'browser/extension_icon_image_unittest.cc', 'browser/extension_pref_value_map_unittest.cc', 'browser/extension_registry_unittest.cc', @@ -139,15 +139,15 @@ 'renderer/api_test_base_unittest.cc', 'renderer/event_unittest.cc', 'renderer/json_schema_unittest.cc', - 'renderer/mojo/keep_alive_client_unittest.cc', 'renderer/messaging_utils_unittest.cc', 'renderer/module_system_test.cc', 'renderer/module_system_test.h', 'renderer/module_system_unittest.cc', + 'renderer/mojo/keep_alive_client_unittest.cc', + 'renderer/mojo/stash_client_unittest.cc', 'renderer/safe_builtins_unittest.cc', 'renderer/script_context_set_unittest.cc', 'renderer/script_context_unittest.cc', - 'renderer/mojo/stash_client_unittest.cc', 'renderer/utils_unittest.cc', 'test/extensions_unittests_main.cc', 'utility/unpacker_unittest.cc', diff --git a/extensions/shell/app_shell.gypi b/extensions/shell/app_shell.gypi index 8b10146..8763e64 100644 --- a/extensions/shell/app_shell.gypi +++ b/extensions/shell/app_shell.gypi @@ -11,8 +11,6 @@ 'app/shell_main_delegate.h', 'browser/api/identity/identity_api.cc', 'browser/api/identity/identity_api.h', - 'browser/shell_browser_context_keyed_service_factories.cc', - 'browser/shell_browser_context_keyed_service_factories.h', 'browser/default_shell_browser_main_delegate.cc', 'browser/default_shell_browser_main_delegate.h', 'browser/desktop_controller.cc', @@ -30,6 +28,8 @@ 'browser/shell_audio_controller_chromeos.h', 'browser/shell_browser_context.cc', 'browser/shell_browser_context.h', + 'browser/shell_browser_context_keyed_service_factories.cc', + 'browser/shell_browser_context_keyed_service_factories.h', 'browser/shell_browser_main_delegate.h', 'browser/shell_browser_main_parts.cc', 'browser/shell_browser_main_parts.h', @@ -113,8 +113,8 @@ 'app/shell_main.cc', ], 'app_shell_sources_mac': [ - 'app/shell_main_mac.h', 'app/shell_main_mac.cc', + 'app/shell_main_mac.h', ], 'app_shell_unittests_sources': [ '../test/extensions_unittests_main.cc', -- cgit v1.1