diff options
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/BUILD.gn | 239 | ||||
| -rw-r--r-- | extensions/browser/BUILD.gn | 17 | ||||
| -rw-r--r-- | extensions/common/BUILD.gn | 470 | ||||
| -rw-r--r-- | extensions/common/api/schemas.gni | 9 | ||||
| -rw-r--r-- | extensions/renderer/BUILD.gn | 4 | ||||
| -rw-r--r-- | extensions/shell/common/api/BUILD.gn | 4 | ||||
| -rw-r--r-- | extensions/shell/common/api/schemas.gni | 9 | ||||
| -rw-r--r-- | extensions/utility/BUILD.gn | 4 |
8 files changed, 370 insertions, 386 deletions
diff --git a/extensions/BUILD.gn b/extensions/BUILD.gn index d90fde8..d62b34d 100644 --- a/extensions/BUILD.gn +++ b/extensions/BUILD.gn @@ -37,7 +37,10 @@ grit("extensions_browser_resources") { "extensions_browser_resources_100_percent.pak", "extensions_browser_resources_200_percent.pak", ] - grit_flags = [ "-E", "mojom_root=" + rebase_path(root_gen_dir) ] + grit_flags = [ + "-E", + "mojom_root=" + rebase_path(root_gen_dir), + ] } # GYP version: extensions/extensions_resources.gyp:extensions_resources @@ -48,7 +51,10 @@ grit("extensions_renderer_resources") { "grit/extensions_renderer_resources.h", "extensions_renderer_resources.pak", ] - grit_flags = [ "-E", "mojom_root=" + rebase_path(root_gen_dir) ] + grit_flags = [ + "-E", + "mojom_root=" + rebase_path(root_gen_dir), + ] deps = [ "//device/serial:serial_mojo", @@ -94,7 +100,7 @@ source_set("test_support") { "test/test_permission_message_provider.h", "test/test_service_registration_manager.cc", "test/test_service_registration_manager.h", - ] + ] deps = [ ":extensions_resources", @@ -112,13 +118,10 @@ source_set("test_support") { ] if (is_win) { - cflags = [ - "/wd4267", # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - ] + cflags = [ "/wd4267" ] # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. } } - # GYP version: //extensions/extensions.gyp:extensions_shell_and_test_pak repack("shell_and_test_pak") { sources = [ @@ -158,119 +161,117 @@ repack("shell_and_test_pak") { # does not have a reference to CreateNativeWebModalManager but it still links. # The GN build fails with this symbol being undefined. if (false) { -test("extensions_unittests") { - sources = [ - "browser/admin_policy_unittest.cc", - "browser/api/api_resource_manager_unittest.cc", - "browser/api/declarative/declarative_rule_unittest.cc", - "browser/api/declarative/deduping_factory_unittest.cc", - "browser/api/declarative_webrequest/webrequest_condition_attribute_unittest.cc", - "browser/api/declarative_webrequest/webrequest_condition_unittest.cc", - "browser/api/sockets_tcp/sockets_tcp_api_unittest.cc", - "browser/api/storage/settings_quota_unittest.cc", - "browser/api/storage/storage_api_unittest.cc", - "browser/api/storage/storage_frontend_unittest.cc", - "browser/api/web_request/form_data_parser_unittest.cc", - "browser/api/web_request/upload_data_presenter_unittest.cc", - "browser/api/web_request/web_request_time_tracker_unittest.cc", - "browser/api/cast_channel/cast_auth_ica_unittest.cc", - "browser/api/cast_channel/cast_auth_util_unittest.cc", - "browser/api/cast_channel/cast_channel_api_unittest.cc", - "browser/api/cast_channel/cast_framer_unittest.cc", - "browser/api/cast_channel/cast_socket_unittest.cc", - "browser/api/cast_channel/cast_transport_unittest.cc", - "browser/api/cast_channel/logger_unittest.cc", - "browser/computed_hashes_unittest.cc", - "browser/content_hash_tree_unittest.cc", - "browser/event_listener_map_unittest.cc", - "browser/event_router_unittest.cc", - "browser/extension_pref_value_map_unittest.cc", - "browser/extension_registry_unittest.cc", - "browser/file_highlighter_unittest.cc", - "browser/file_reader_unittest.cc", - "browser/guest_view/guest_view_manager_unittest.cc", - "browser/image_loader_unittest.cc", - "browser/image_util_unittest.cc", - "browser/info_map_unittest.cc", - "browser/lazy_background_task_queue_unittest.cc", - "browser/management_policy_unittest.cc", - "browser/mojo/keep_alive_impl_unittest.cc", - "browser/process_manager_unittest.cc", - "browser/process_map_unittest.cc", - "browser/quota_service_unittest.cc", - "browser/runtime_data_unittest.cc", - "browser/value_store/leveldb_value_store_unittest.cc", - "browser/value_store/testing_value_store_unittest.cc", - "browser/value_store/value_store_change_unittest.cc", - "browser/value_store/value_store_frontend_unittest.cc", - "browser/value_store/value_store_unittest.cc", - "browser/value_store/value_store_unittest.h", - "browser/verified_contents_unittest.cc", - "browser/warning_service_unittest.cc", - "common/api/sockets/sockets_manifest_permission_unittest.cc", - "common/csp_validator_unittest.cc", - "common/event_filter_unittest.cc", - "common/extension_l10n_util_unittest.cc", - "common/extension_resource_unittest.cc", - "common/extension_set_unittest.cc", - "common/file_util_unittest.cc", - "common/manifest_handler_unittest.cc", - "common/manifest_handlers/oauth2_manifest_unittest.cc", - "common/manifest_handlers/shared_module_manifest_unittest.cc", - "common/message_bundle_unittest.cc", - "common/one_shot_event_unittest.cc", - "common/permissions/manifest_permission_set_unittest.cc", - "common/stack_frame_unittest.cc", - "common/url_pattern_set_unittest.cc", - "common/url_pattern_unittest.cc", - "common/user_script_unittest.cc", - "renderer/activity_log_converter_strategy_unittest.cc", - "renderer/api/serial/data_receiver_unittest.cc", - "renderer/api/serial/data_sender_unittest.cc", - "renderer/api/serial/serial_api_unittest.cc", - "renderer/api_test_base.cc", - "renderer/api_test_base.h", - "renderer/api_test_base_unittest.cc", - "renderer/event_unittest.cc", - "renderer/json_schema_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/safe_builtins_unittest.cc", - "renderer/script_context_set_unittest.cc", - "renderer/utils_unittest.cc", - "test/extensions_unittests_main.cc", - ] - - deps = [ - ":extensions_resources", - ":shell_and_test_pak", - ":test_support", - "//base", - "//base:prefs_test_support", - "//base/test:test_support", - "//components/keyed_service/content", - "//content/test:test_support", - "//device/serial", - "//device/serial:test_util", - "//extensions/common", - "//extensions/renderer", - "//extensions/strings", - "//mojo/edk/js", - "//mojo/edk/system", - "//mojo/environment:chromium", - "//mojo/public/cpp/bindings", - "//testing/gmock", - "//testing/gtest", - "//third_party/leveldatabase", - ] + test("extensions_unittests") { + sources = [ + "browser/admin_policy_unittest.cc", + "browser/api/api_resource_manager_unittest.cc", + "browser/api/declarative/declarative_rule_unittest.cc", + "browser/api/declarative/deduping_factory_unittest.cc", + "browser/api/declarative_webrequest/webrequest_condition_attribute_unittest.cc", + "browser/api/declarative_webrequest/webrequest_condition_unittest.cc", + "browser/api/sockets_tcp/sockets_tcp_api_unittest.cc", + "browser/api/storage/settings_quota_unittest.cc", + "browser/api/storage/storage_api_unittest.cc", + "browser/api/storage/storage_frontend_unittest.cc", + "browser/api/web_request/form_data_parser_unittest.cc", + "browser/api/web_request/upload_data_presenter_unittest.cc", + "browser/api/web_request/web_request_time_tracker_unittest.cc", + "browser/api/cast_channel/cast_auth_ica_unittest.cc", + "browser/api/cast_channel/cast_auth_util_unittest.cc", + "browser/api/cast_channel/cast_channel_api_unittest.cc", + "browser/api/cast_channel/cast_framer_unittest.cc", + "browser/api/cast_channel/cast_socket_unittest.cc", + "browser/api/cast_channel/cast_transport_unittest.cc", + "browser/api/cast_channel/logger_unittest.cc", + "browser/computed_hashes_unittest.cc", + "browser/content_hash_tree_unittest.cc", + "browser/event_listener_map_unittest.cc", + "browser/event_router_unittest.cc", + "browser/extension_pref_value_map_unittest.cc", + "browser/extension_registry_unittest.cc", + "browser/file_highlighter_unittest.cc", + "browser/file_reader_unittest.cc", + "browser/guest_view/guest_view_manager_unittest.cc", + "browser/image_loader_unittest.cc", + "browser/image_util_unittest.cc", + "browser/info_map_unittest.cc", + "browser/lazy_background_task_queue_unittest.cc", + "browser/management_policy_unittest.cc", + "browser/mojo/keep_alive_impl_unittest.cc", + "browser/process_manager_unittest.cc", + "browser/process_map_unittest.cc", + "browser/quota_service_unittest.cc", + "browser/runtime_data_unittest.cc", + "browser/value_store/leveldb_value_store_unittest.cc", + "browser/value_store/testing_value_store_unittest.cc", + "browser/value_store/value_store_change_unittest.cc", + "browser/value_store/value_store_frontend_unittest.cc", + "browser/value_store/value_store_unittest.cc", + "browser/value_store/value_store_unittest.h", + "browser/verified_contents_unittest.cc", + "browser/warning_service_unittest.cc", + "common/api/sockets/sockets_manifest_permission_unittest.cc", + "common/csp_validator_unittest.cc", + "common/event_filter_unittest.cc", + "common/extension_l10n_util_unittest.cc", + "common/extension_resource_unittest.cc", + "common/extension_set_unittest.cc", + "common/file_util_unittest.cc", + "common/manifest_handler_unittest.cc", + "common/manifest_handlers/oauth2_manifest_unittest.cc", + "common/manifest_handlers/shared_module_manifest_unittest.cc", + "common/message_bundle_unittest.cc", + "common/one_shot_event_unittest.cc", + "common/permissions/manifest_permission_set_unittest.cc", + "common/stack_frame_unittest.cc", + "common/url_pattern_set_unittest.cc", + "common/url_pattern_unittest.cc", + "common/user_script_unittest.cc", + "renderer/activity_log_converter_strategy_unittest.cc", + "renderer/api/serial/data_receiver_unittest.cc", + "renderer/api/serial/data_sender_unittest.cc", + "renderer/api/serial/serial_api_unittest.cc", + "renderer/api_test_base.cc", + "renderer/api_test_base.h", + "renderer/api_test_base_unittest.cc", + "renderer/event_unittest.cc", + "renderer/json_schema_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/safe_builtins_unittest.cc", + "renderer/script_context_set_unittest.cc", + "renderer/utils_unittest.cc", + "test/extensions_unittests_main.cc", + ] - if (is_win) { - deps += [ - "//base/allocator", + deps = [ + ":extensions_resources", + ":shell_and_test_pak", + ":test_support", + "//base", + "//base:prefs_test_support", + "//base/test:test_support", + "//components/keyed_service/content", + "//content/test:test_support", + "//device/serial", + "//device/serial:test_util", + "//extensions/common", + "//extensions/renderer", + "//extensions/strings", + "//mojo/edk/js", + "//mojo/edk/system", + "//mojo/environment:chromium", + "//mojo/public/cpp/bindings", + "//testing/gmock", + "//testing/gtest", + "//third_party/leveldatabase", ] + + if (is_win) { + deps += [ "//base/allocator" ] + } } } -} diff --git a/extensions/browser/BUILD.gn b/extensions/browser/BUILD.gn index cb99369..3db7700 100644 --- a/extensions/browser/BUILD.gn +++ b/extensions/browser/BUILD.gn @@ -7,8 +7,7 @@ import("//build/config/features.gni") # GYP version: extensions/extensions.gyp:extensions_browser source_set("browser") { - sources = [ - ] + sources = [] deps = [ "//components/copresence_sockets", @@ -27,7 +26,7 @@ source_set("browser") { "//google_apis", "//skia", "//third_party/leveldatabase", - "//third_party/re2" + "//third_party/re2", ] if (enable_extensions) { @@ -509,13 +508,9 @@ source_set("browser") { ] if (use_openssl) { - sources += [ - "api/cast_channel/cast_auth_util_openssl.cc", - ] + sources += [ "api/cast_channel/cast_auth_util_openssl.cc" ] } else { - sources += [ - "api/cast_channel/cast_auth_util_nss.cc", - ] + sources += [ "api/cast_channel/cast_auth_util_nss.cc" ] } if (is_chromeos) { @@ -530,8 +525,6 @@ source_set("browser") { } if (is_win) { - cflags = [ - "/wd4267", # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - ] + cflags = [ "/wd4267" ] # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. } } diff --git a/extensions/common/BUILD.gn b/extensions/common/BUILD.gn index c8c1971..4b6ff4a 100644 --- a/extensions/common/BUILD.gn +++ b/extensions/common/BUILD.gn @@ -13,251 +13,245 @@ source_set("common_constants") { ] if (is_win) { - cflags = [ - "/wd4267", # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - ] + cflags = [ "/wd4267" ] # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. } } if (enable_extensions) { + mojom("mojo") { + sources = [ + "mojo/keep_alive.mojom", + "mojo/stash.mojom", + ] + } -mojom("mojo") { - sources = [ - "mojo/keep_alive.mojom", - "mojo/stash.mojom", - ] -} - - -# GYP version: extensions/extensions.gyp:extensions_common -source_set("common") { - sources = [ - "api/messaging/message.h", - "api/bluetooth/bluetooth_manifest_data.cc", - "api/bluetooth/bluetooth_manifest_data.h", - "api/bluetooth/bluetooth_manifest_handler.cc", - "api/bluetooth/bluetooth_manifest_handler.h", - "api/bluetooth/bluetooth_manifest_permission.cc", - "api/bluetooth/bluetooth_manifest_permission.h", - "api/sockets/sockets_manifest_data.cc", - "api/sockets/sockets_manifest_data.h", - "api/sockets/sockets_manifest_handler.cc", - "api/sockets/sockets_manifest_handler.h", - "api/sockets/sockets_manifest_permission.cc", - "api/sockets/sockets_manifest_permission.h", - "common_manifest_handlers.cc", - "common_manifest_handlers.h", - "csp_validator.cc", - "csp_validator.h", - "dom_action_types.h", - "draggable_region.cc", - "draggable_region.h", - "error_utils.cc", - "error_utils.h", - "event_filter.cc", - "event_filter.h", - "event_filtering_info.cc", - "event_filtering_info.h", - "event_matcher.cc", - "event_matcher.h", - "extension.cc", - "extension.h", - "extension_api.cc", - "extension_api.h", - "extension_icon_set.cc", - "extension_icon_set.h", - "extension_l10n_util.cc", - "extension_l10n_util.h", - "extension_message_generator.cc", - "extension_message_generator.h", - "extension_messages.cc", - "extension_messages.h", - "extension_paths.cc", - "extension_paths.h", - "extension_resource.cc", - "extension_resource.h", - "extension_set.cc", - "extension_set.h", - "extension_urls.cc", - "extension_urls.h", - "extensions_client.cc", - "extensions_client.h", - "feature_switch.cc", - "feature_switch.h", - "features/api_feature.cc", - "features/api_feature.h", - "features/base_feature_provider.cc", - "features/base_feature_provider.h", - "features/complex_feature.cc", - "features/complex_feature.h", - "features/feature.cc", - "features/feature.h", - "features/feature_provider.cc", - "features/feature_provider.h", - "features/json_feature_provider_source.cc", - "features/json_feature_provider_source.h", - "features/manifest_feature.cc", - "features/manifest_feature.h", - "features/permission_feature.cc", - "features/permission_feature.h", - "features/simple_feature.cc", - "features/simple_feature.h", - "features/simple_feature_filter.cc", - "features/simple_feature_filter.h", - "file_util.cc", - "file_util.h", - "guest_view/guest_view_constants.cc", - "guest_view/guest_view_constants.h", - "install_warning.cc", - "install_warning.h", - "manifest.cc", - "manifest.h", - "manifest_constants.cc", - "manifest_constants.h", - "manifest_handler.cc", - "manifest_handler.h", - "manifest_handler_helpers.cc", - "manifest_handler_helpers.h", - "manifest_handlers/background_info.cc", - "manifest_handlers/background_info.h", - "manifest_handlers/csp_info.cc", - "manifest_handlers/csp_info.h", - "manifest_handlers/default_locale_handler.cc", - "manifest_handlers/default_locale_handler.h", - "manifest_handlers/externally_connectable.cc", - "manifest_handlers/externally_connectable.h", - "manifest_handlers/file_handler_info.cc", - "manifest_handlers/file_handler_info.h", - "manifest_handlers/icons_handler.cc", - "manifest_handlers/icons_handler.h", - "manifest_handlers/incognito_info.cc", - "manifest_handlers/incognito_info.h", - "manifest_handlers/kiosk_mode_info.cc", - "manifest_handlers/kiosk_mode_info.h", - "manifest_handlers/launcher_page_info.cc", - "manifest_handlers/launcher_page_info.h", - "manifest_handlers/oauth2_manifest_handler.cc", - "manifest_handlers/oauth2_manifest_handler.h", - "manifest_handlers/offline_enabled_info.cc", - "manifest_handlers/offline_enabled_info.h", - "manifest_handlers/options_page_info.cc", - "manifest_handlers/options_page_info.h", - "manifest_handlers/permissions_parser.cc", - "manifest_handlers/permissions_parser.h", - "manifest_handlers/requirements_info.cc", - "manifest_handlers/requirements_info.h", - "manifest_handlers/sandboxed_page_info.cc", - "manifest_handlers/sandboxed_page_info.h", - "manifest_handlers/shared_module_info.cc", - "manifest_handlers/shared_module_info.h", - "manifest_handlers/web_accessible_resources_info.cc", - "manifest_handlers/web_accessible_resources_info.h", - "manifest_handlers/webview_info.cc", - "manifest_handlers/webview_info.h", - "manifest_url_handlers.cc", - "manifest_url_handlers.h", - "message_bundle.cc", - "message_bundle.h", - "one_shot_event.cc", - "one_shot_event.h", - "permissions/api_permission.cc", - "permissions/api_permission.h", - "permissions/api_permission_set.cc", - "permissions/api_permission_set.h", - "permissions/base_set_operators.h", - "permissions/extensions_api_permissions.cc", - "permissions/extensions_api_permissions.h", - "permissions/manifest_permission.cc", - "permissions/manifest_permission.h", - "permissions/manifest_permission_set.cc", - "permissions/manifest_permission_set.h", - "permissions/media_galleries_permission.cc", - "permissions/media_galleries_permission.h", - "permissions/media_galleries_permission_data.cc", - "permissions/media_galleries_permission_data.h", - "permissions/permission_message.cc", - "permissions/permission_message.h", - "permissions/permission_message_provider.cc", - "permissions/permission_message_provider.h", - "permissions/permission_message_util.cc", - "permissions/permission_message_util.h", - "permissions/permission_set.cc", - "permissions/permission_set.h", - "permissions/permissions_data.cc", - "permissions/permissions_data.h", - "permissions/permissions_info.cc", - "permissions/permissions_info.h", - "permissions/permissions_provider.h", - "permissions/set_disjunction_permission.h", - "permissions/settings_override_permission.cc", - "permissions/settings_override_permission.h", - "permissions/socket_permission.cc", - "permissions/socket_permission.h", - "permissions/socket_permission_data.cc", - "permissions/socket_permission_data.h", - "permissions/socket_permission_entry.cc", - "permissions/socket_permission_entry.h", - "permissions/usb_device_permission.cc", - "permissions/usb_device_permission.h", - "permissions/usb_device_permission_data.cc", - "permissions/usb_device_permission_data.h", - "stack_frame.cc", - "stack_frame.h", - "switches.cc", - "switches.h", - "update_manifest.cc", - "update_manifest.h", - "url_pattern.cc", - "url_pattern.h", - "url_pattern_set.cc", - "url_pattern_set.h", - "user_script.cc", - "user_script.h", - "value_counter.cc", - "value_counter.h", - "view_type.cc", - "view_type.h", - ] + # GYP version: extensions/extensions.gyp:extensions_common + source_set("common") { + sources = [ + "api/messaging/message.h", + "api/bluetooth/bluetooth_manifest_data.cc", + "api/bluetooth/bluetooth_manifest_data.h", + "api/bluetooth/bluetooth_manifest_handler.cc", + "api/bluetooth/bluetooth_manifest_handler.h", + "api/bluetooth/bluetooth_manifest_permission.cc", + "api/bluetooth/bluetooth_manifest_permission.h", + "api/sockets/sockets_manifest_data.cc", + "api/sockets/sockets_manifest_data.h", + "api/sockets/sockets_manifest_handler.cc", + "api/sockets/sockets_manifest_handler.h", + "api/sockets/sockets_manifest_permission.cc", + "api/sockets/sockets_manifest_permission.h", + "common_manifest_handlers.cc", + "common_manifest_handlers.h", + "csp_validator.cc", + "csp_validator.h", + "dom_action_types.h", + "draggable_region.cc", + "draggable_region.h", + "error_utils.cc", + "error_utils.h", + "event_filter.cc", + "event_filter.h", + "event_filtering_info.cc", + "event_filtering_info.h", + "event_matcher.cc", + "event_matcher.h", + "extension.cc", + "extension.h", + "extension_api.cc", + "extension_api.h", + "extension_icon_set.cc", + "extension_icon_set.h", + "extension_l10n_util.cc", + "extension_l10n_util.h", + "extension_message_generator.cc", + "extension_message_generator.h", + "extension_messages.cc", + "extension_messages.h", + "extension_paths.cc", + "extension_paths.h", + "extension_resource.cc", + "extension_resource.h", + "extension_set.cc", + "extension_set.h", + "extension_urls.cc", + "extension_urls.h", + "extensions_client.cc", + "extensions_client.h", + "feature_switch.cc", + "feature_switch.h", + "features/api_feature.cc", + "features/api_feature.h", + "features/base_feature_provider.cc", + "features/base_feature_provider.h", + "features/complex_feature.cc", + "features/complex_feature.h", + "features/feature.cc", + "features/feature.h", + "features/feature_provider.cc", + "features/feature_provider.h", + "features/json_feature_provider_source.cc", + "features/json_feature_provider_source.h", + "features/manifest_feature.cc", + "features/manifest_feature.h", + "features/permission_feature.cc", + "features/permission_feature.h", + "features/simple_feature.cc", + "features/simple_feature.h", + "features/simple_feature_filter.cc", + "features/simple_feature_filter.h", + "file_util.cc", + "file_util.h", + "guest_view/guest_view_constants.cc", + "guest_view/guest_view_constants.h", + "install_warning.cc", + "install_warning.h", + "manifest.cc", + "manifest.h", + "manifest_constants.cc", + "manifest_constants.h", + "manifest_handler.cc", + "manifest_handler.h", + "manifest_handler_helpers.cc", + "manifest_handler_helpers.h", + "manifest_handlers/background_info.cc", + "manifest_handlers/background_info.h", + "manifest_handlers/csp_info.cc", + "manifest_handlers/csp_info.h", + "manifest_handlers/default_locale_handler.cc", + "manifest_handlers/default_locale_handler.h", + "manifest_handlers/externally_connectable.cc", + "manifest_handlers/externally_connectable.h", + "manifest_handlers/file_handler_info.cc", + "manifest_handlers/file_handler_info.h", + "manifest_handlers/icons_handler.cc", + "manifest_handlers/icons_handler.h", + "manifest_handlers/incognito_info.cc", + "manifest_handlers/incognito_info.h", + "manifest_handlers/kiosk_mode_info.cc", + "manifest_handlers/kiosk_mode_info.h", + "manifest_handlers/launcher_page_info.cc", + "manifest_handlers/launcher_page_info.h", + "manifest_handlers/oauth2_manifest_handler.cc", + "manifest_handlers/oauth2_manifest_handler.h", + "manifest_handlers/offline_enabled_info.cc", + "manifest_handlers/offline_enabled_info.h", + "manifest_handlers/options_page_info.cc", + "manifest_handlers/options_page_info.h", + "manifest_handlers/permissions_parser.cc", + "manifest_handlers/permissions_parser.h", + "manifest_handlers/requirements_info.cc", + "manifest_handlers/requirements_info.h", + "manifest_handlers/sandboxed_page_info.cc", + "manifest_handlers/sandboxed_page_info.h", + "manifest_handlers/shared_module_info.cc", + "manifest_handlers/shared_module_info.h", + "manifest_handlers/web_accessible_resources_info.cc", + "manifest_handlers/web_accessible_resources_info.h", + "manifest_handlers/webview_info.cc", + "manifest_handlers/webview_info.h", + "manifest_url_handlers.cc", + "manifest_url_handlers.h", + "message_bundle.cc", + "message_bundle.h", + "one_shot_event.cc", + "one_shot_event.h", + "permissions/api_permission.cc", + "permissions/api_permission.h", + "permissions/api_permission_set.cc", + "permissions/api_permission_set.h", + "permissions/base_set_operators.h", + "permissions/extensions_api_permissions.cc", + "permissions/extensions_api_permissions.h", + "permissions/manifest_permission.cc", + "permissions/manifest_permission.h", + "permissions/manifest_permission_set.cc", + "permissions/manifest_permission_set.h", + "permissions/media_galleries_permission.cc", + "permissions/media_galleries_permission.h", + "permissions/media_galleries_permission_data.cc", + "permissions/media_galleries_permission_data.h", + "permissions/permission_message.cc", + "permissions/permission_message.h", + "permissions/permission_message_provider.cc", + "permissions/permission_message_provider.h", + "permissions/permission_message_util.cc", + "permissions/permission_message_util.h", + "permissions/permission_set.cc", + "permissions/permission_set.h", + "permissions/permissions_data.cc", + "permissions/permissions_data.h", + "permissions/permissions_info.cc", + "permissions/permissions_info.h", + "permissions/permissions_provider.h", + "permissions/set_disjunction_permission.h", + "permissions/settings_override_permission.cc", + "permissions/settings_override_permission.h", + "permissions/socket_permission.cc", + "permissions/socket_permission.h", + "permissions/socket_permission_data.cc", + "permissions/socket_permission_data.h", + "permissions/socket_permission_entry.cc", + "permissions/socket_permission_entry.h", + "permissions/usb_device_permission.cc", + "permissions/usb_device_permission.h", + "permissions/usb_device_permission_data.cc", + "permissions/usb_device_permission_data.h", + "stack_frame.cc", + "stack_frame.h", + "switches.cc", + "switches.h", + "update_manifest.cc", + "update_manifest.h", + "url_pattern.cc", + "url_pattern.h", + "url_pattern_set.cc", + "url_pattern_set.h", + "user_script.cc", + "user_script.h", + "value_counter.cc", + "value_counter.h", + "view_type.cc", + "view_type.h", + ] - deps = [ - ":common_constants", - ":mojo", - # TODO(benwells): figure out what to do with the api target and - # api resources compiled into the chrome resource bundle. - # http://crbug.com/162530 - "//chrome:resources", - "//components/crx_file", - "//components/url_matcher", - "//content/public/common", - "//crypto", - "//device/bluetooth", - "//device/usb", - "//extensions/common/api", - "//extensions/strings", - "//extensions:extensions_resources", - "//ipc", - "//net", - "//third_party/icu", - "//third_party/libxml", - "//third_party/re2", - "//ui/base", - "//ui/gfx/geometry", - "//ui/gfx/ipc", - "//url", - ] + deps = [ + ":common_constants", + ":mojo", - if (enable_nacl) { - sources += [ - "manifest_handlers/nacl_modules_handler.cc", - "manifest_handlers/nacl_modules_handler.h", + # TODO(benwells): figure out what to do with the api target and + # api resources compiled into the chrome resource bundle. + # http://crbug.com/162530 + "//chrome:resources", + "//components/crx_file", + "//components/url_matcher", + "//content/public/common", + "//crypto", + "//device/bluetooth", + "//device/usb", + "//extensions/common/api", + "//extensions/strings", + "//extensions:extensions_resources", + "//ipc", + "//net", + "//third_party/icu", + "//third_party/libxml", + "//third_party/re2", + "//ui/base", + "//ui/gfx/geometry", + "//ui/gfx/ipc", + "//url", ] - } - if (is_win) { - cflags = [ - "/wd4267", # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - ] - } -} + if (enable_nacl) { + sources += [ + "manifest_handlers/nacl_modules_handler.cc", + "manifest_handlers/nacl_modules_handler.h", + ] + } -} # enable_extensions + if (is_win) { + cflags = [ "/wd4267" ] # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. + } + } +} # enable_extensions diff --git a/extensions/common/api/schemas.gni b/extensions/common/api/schemas.gni index 651a785..af770af 100644 --- a/extensions/common/api/schemas.gni +++ b/extensions/common/api/schemas.gni @@ -2,11 +2,10 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -gypi_values = exec_script( - "//build/gypi_to_gn.py", - [ rebase_path("schemas.gypi") ], - "scope", - [ "schemas.gypi" ]) +gypi_values = exec_script("//build/gypi_to_gn.py", + [ rebase_path("schemas.gypi") ], + "scope", + [ "schemas.gypi" ]) sources = gypi_values.schema_files if (is_chromeos) { diff --git a/extensions/renderer/BUILD.gn b/extensions/renderer/BUILD.gn index 3ced1d4..d5ad97c 100644 --- a/extensions/renderer/BUILD.gn +++ b/extensions/renderer/BUILD.gn @@ -173,8 +173,6 @@ source_set("renderer") { ] if (is_win) { - cflags = [ - "/wd4267", # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - ] + cflags = [ "/wd4267" ] # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. } } diff --git a/extensions/shell/common/api/BUILD.gn b/extensions/shell/common/api/BUILD.gn index 0e722f8..1292765 100644 --- a/extensions/shell/common/api/BUILD.gn +++ b/extensions/shell/common/api/BUILD.gn @@ -16,5 +16,7 @@ json_schema_api("api_registration") { impl_dir = "//extensions/shell/browser/api" bundle_registration = true - deps = [ ":api" ] + deps = [ + ":api", + ] } diff --git a/extensions/shell/common/api/schemas.gni b/extensions/shell/common/api/schemas.gni index b3b6db4..3f14cfc 100644 --- a/extensions/shell/common/api/schemas.gni +++ b/extensions/shell/common/api/schemas.gni @@ -2,11 +2,10 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -gypi_values = exec_script( - "//build/gypi_to_gn.py", - [ rebase_path("schemas.gypi") ], - "scope", - [ "schemas.gypi" ]) +gypi_values = exec_script("//build/gypi_to_gn.py", + [ rebase_path("schemas.gypi") ], + "scope", + [ "schemas.gypi" ]) sources = gypi_values.schema_files if (is_chromeos) { diff --git a/extensions/utility/BUILD.gn b/extensions/utility/BUILD.gn index ad884a2..a88421c 100644 --- a/extensions/utility/BUILD.gn +++ b/extensions/utility/BUILD.gn @@ -19,8 +19,6 @@ source_set("utility") { ] if (is_win) { - cflags = [ - "/wd4267", # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - ] + cflags = [ "/wd4267" ] # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. } } |