Index: ios/web/BUILD.gn |
diff --git a/ios/web/BUILD.gn b/ios/web/BUILD.gn |
index 7583843eba609541d3793aa2b1002d8ff8811b99..73ff2ec6bd0909abad30f17485e18506ca1263f8 100644 |
--- a/ios/web/BUILD.gn |
+++ b/ios/web/BUILD.gn |
@@ -90,71 +90,6 @@ source_set("web_arc") { |
"net/request_tracker_impl.mm", |
"net/web_http_protocol_handler_delegate.h", |
"net/web_http_protocol_handler_delegate.mm", |
- "string_util.cc", |
- "url_scheme_util.mm", |
- "url_util.cc", |
- "web_kit_constants.cc", |
- "web_thread_impl.cc", |
- "web_thread_impl.h", |
- "web_view_creation_util.mm", |
- "webui/crw_web_ui_manager.h", |
- "webui/crw_web_ui_manager.mm", |
- "webui/crw_web_ui_page_builder.h", |
- "webui/crw_web_ui_page_builder.mm", |
- "webui/mojo_facade.h", |
- "webui/mojo_facade.mm", |
- "webui/mojo_js_constants.cc", |
- "webui/mojo_js_constants.h", |
- "webui/shared_resources_data_source_ios.h", |
- "webui/shared_resources_data_source_ios.mm", |
- "webui/url_data_manager_ios.cc", |
- "webui/url_data_manager_ios.h", |
- "webui/url_data_manager_ios_backend.h", |
- "webui/url_data_manager_ios_backend.mm", |
- "webui/url_data_source_ios.mm", |
- "webui/url_data_source_ios_impl.cc", |
- "webui/url_data_source_ios_impl.h", |
- "webui/url_fetcher_block_adapter.h", |
- "webui/url_fetcher_block_adapter.mm", |
- "webui/web_ui_ios_controller_factory_registry.cc", |
- "webui/web_ui_ios_controller_factory_registry.h", |
- "webui/web_ui_ios_data_source_impl.h", |
- "webui/web_ui_ios_data_source_impl.mm", |
- "webui/web_ui_ios_impl.h", |
- "webui/web_ui_ios_impl.mm", |
- ] |
- |
- libs = [ "WebKit.framework" ] |
- |
- configs += [ "//build/config/compiler:enable_arc" ] |
-} |
- |
-source_set("web") { |
- deps = [ |
- ":core", |
- ":js_resources", |
- ":resources", |
- ":user_agent", |
- "//base", |
- "//components/url_formatter", |
- "//ios/net", |
- "//ios/third_party/blink:html_tokenizer", |
- "//mojo/public/cpp/system", |
- "//mojo/public/js", |
- "//net", |
- "//services/shell/public/cpp", |
- "//ui/base", |
- "//ui/gfx", |
- "//ui/gfx/geometry:geometry", |
- "//ui/resources", |
- "//url", |
- ] |
- |
- public_deps = [ |
- ":web_arc", |
- ] |
- |
- sources = [ |
"payments/payment_request.cc", |
"public/active_state_manager.h", |
"public/block_types.h", |
@@ -231,6 +166,10 @@ source_set("web") { |
"public/webui/web_ui_ios_controller_factory.h", |
"public/webui/web_ui_ios_message_handler.cc", |
"public/webui/web_ui_ios_message_handler.h", |
+ "string_util.cc", |
+ "url_scheme_util.mm", |
+ "url_util.cc", |
+ "web_kit_constants.cc", |
"web_state/blocked_popup_info.h", |
"web_state/blocked_popup_info.mm", |
"web_state/context_menu_params.mm", |
@@ -267,6 +206,67 @@ source_set("web") { |
"web_state/ui/crw_web_controller_container_view.h", |
"web_state/ui/crw_web_controller_container_view.mm", |
"web_state/ui/crw_web_view_content_view.mm", |
+ "web_thread_impl.cc", |
+ "web_thread_impl.h", |
+ "web_view_creation_util.mm", |
+ "webui/crw_web_ui_manager.h", |
+ "webui/crw_web_ui_manager.mm", |
+ "webui/crw_web_ui_page_builder.h", |
+ "webui/crw_web_ui_page_builder.mm", |
+ "webui/mojo_facade.h", |
+ "webui/mojo_facade.mm", |
+ "webui/mojo_js_constants.cc", |
+ "webui/mojo_js_constants.h", |
+ "webui/shared_resources_data_source_ios.h", |
+ "webui/shared_resources_data_source_ios.mm", |
+ "webui/url_data_manager_ios.cc", |
+ "webui/url_data_manager_ios.h", |
+ "webui/url_data_manager_ios_backend.h", |
+ "webui/url_data_manager_ios_backend.mm", |
+ "webui/url_data_source_ios.mm", |
+ "webui/url_data_source_ios_impl.cc", |
+ "webui/url_data_source_ios_impl.h", |
+ "webui/url_fetcher_block_adapter.h", |
+ "webui/url_fetcher_block_adapter.mm", |
+ "webui/web_ui_ios_controller_factory_registry.cc", |
+ "webui/web_ui_ios_controller_factory_registry.h", |
+ "webui/web_ui_ios_data_source_impl.h", |
+ "webui/web_ui_ios_data_source_impl.mm", |
+ "webui/web_ui_ios_impl.h", |
+ "webui/web_ui_ios_impl.mm", |
+ ] |
+ |
+ libs = [ "WebKit.framework" ] |
+ |
+ configs += [ "//build/config/compiler:enable_arc" ] |
+} |
+ |
+source_set("web") { |
+ deps = [ |
+ ":core", |
+ ":js_resources", |
+ ":resources", |
+ ":user_agent", |
+ "//base", |
+ "//components/url_formatter", |
+ "//ios/net", |
+ "//ios/third_party/blink:html_tokenizer", |
+ "//mojo/public/cpp/system", |
+ "//mojo/public/js", |
+ "//net", |
+ "//services/shell/public/cpp", |
+ "//ui/base", |
+ "//ui/gfx", |
+ "//ui/gfx/geometry:geometry", |
+ "//ui/resources", |
+ "//url", |
+ ] |
+ |
+ public_deps = [ |
+ ":web_arc", |
+ ] |
+ |
+ sources = [ |
"web_state/ui/crw_wk_script_message_router.h", |
"web_state/ui/crw_wk_script_message_router.mm", |
"web_state/ui/web_view_js_utils.h", |