summaryrefslogtreecommitdiff
path: root/chromium/ios/web
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/ios/web')
-rw-r--r--chromium/ios/web/BUILD.gn7
-rw-r--r--chromium/ios/web/public/BUILD.gn5
-rw-r--r--chromium/ios/web/public/test/BUILD.gn1
-rw-r--r--chromium/ios/web/public/test/fakes/BUILD.gn2
-rw-r--r--chromium/ios/web/web_state/BUILD.gn2
-rw-r--r--chromium/ios/web/web_state/js/BUILD.gn13
-rw-r--r--chromium/ios/web/web_state/ui/BUILD.gn2
7 files changed, 29 insertions, 3 deletions
diff --git a/chromium/ios/web/BUILD.gn b/chromium/ios/web/BUILD.gn
index 3f9886a6a23..fa431352c9c 100644
--- a/chromium/ios/web/BUILD.gn
+++ b/chromium/ios/web/BUILD.gn
@@ -212,6 +212,7 @@ source_set("ios_web_general_unittests") {
"url_scheme_util_unittest.mm",
"url_util_unittest.cc",
"web_client_unittest.mm",
+ "web_thread_unittest.cc",
]
}
@@ -256,7 +257,6 @@ source_set("ios_web_navigation_unittests") {
"navigation/navigation_manager_impl_unittest.mm",
"navigation/navigation_manager_util_unittest.mm",
"navigation/nscoder_util_unittest.mm",
- "navigation/serializable_user_data_manager_impl_unittest.mm",
"navigation/wk_based_navigation_manager_impl_unittest.mm",
"navigation/wk_navigation_util_unittest.mm",
]
@@ -409,6 +409,7 @@ source_set("ios_web_web_state_unittests") {
"web_state/web_state_delegate_bridge_unittest.mm",
"web_state/web_state_impl_unittest.mm",
"web_state/web_state_observer_bridge_unittest.mm",
+ "web_state/web_state_policy_decider_bridge_unittest.mm",
"web_state/web_state_unittest.mm",
"web_state/web_view_internal_creation_util_unittest.mm",
"web_state/wk_web_view_security_util_unittest.mm",
@@ -435,6 +436,7 @@ source_set("ios_web_web_state_js_unittests") {
"//ios/web/web_state:context_menu",
"//ios/web/web_state:navigation_context",
"//ios/web/web_state/js",
+ "//ios/web/web_state/js:script_util",
"//ios/web/web_state/ui:crw_wk_script_message_router",
"//net:test_support",
"//services/service_manager/public/cpp",
@@ -479,6 +481,7 @@ source_set("ios_web_web_state_ui_unittests") {
"//ios/web/web_state:navigation_context",
"//ios/web/web_state:wk_web_view_security_util",
"//ios/web/web_state/js",
+ "//ios/web/web_state/js:script_util",
"//ios/web/web_state/ui:crw_context_menu_controller",
"//ios/web/web_state/ui:crw_wk_script_message_router",
"//ios/web/web_state/ui:favicon_util",
@@ -577,8 +580,8 @@ test("ios_web_inttests") {
"web_state/error_page_inttest.mm",
"web_state/favicon_callbacks_inttest.mm",
"web_state/http_auth_inttest.mm",
- "web_state/navigation_and_load_callbacks_inttest.mm",
"web_state/web_frames_manager_inttest.mm",
+ "web_state/web_state_observer_inttest.mm",
"webui/web_ui_mojo_inttest.mm",
]
diff --git a/chromium/ios/web/public/BUILD.gn b/chromium/ios/web/public/BUILD.gn
index 35f46c98d3e..65cce83225d 100644
--- a/chromium/ios/web/public/BUILD.gn
+++ b/chromium/ios/web/public/BUILD.gn
@@ -79,12 +79,12 @@ source_set("public") {
"web_state/ui/crw_generic_content_view.h",
"web_state/ui/crw_native_content.h",
"web_state/ui/crw_native_content_provider.h",
- "web_state/ui/crw_web_delegate.h",
"web_state/ui/crw_web_view_content_view.h",
"web_state/ui/crw_web_view_proxy.h",
"web_state/ui/crw_web_view_scroll_view_proxy.h",
"web_state/url_verification_constants.h",
"web_state/web_frame.h",
+ "web_state/web_frame_user_data.h",
"web_state/web_frames_manager.h",
"web_state/web_state.h",
"web_state/web_state_delegate.h",
@@ -94,7 +94,10 @@ source_set("public") {
"web_state/web_state_observer.h",
"web_state/web_state_observer_bridge.h",
"web_state/web_state_policy_decider.h",
+ "web_state/web_state_policy_decider_bridge.h",
"web_state/web_state_user_data.h",
+ "web_task_traits.cc",
+ "web_task_traits.h",
"web_thread.h",
"web_thread_delegate.h",
"web_ui_ios_data_source.h",
diff --git a/chromium/ios/web/public/test/BUILD.gn b/chromium/ios/web/public/test/BUILD.gn
index 626e0464fb0..4f0e9792806 100644
--- a/chromium/ios/web/public/test/BUILD.gn
+++ b/chromium/ios/web/public/test/BUILD.gn
@@ -19,6 +19,7 @@ source_set("test") {
"//ios/web/public/test/http_server",
"//ios/web/test:test_support",
"//ios/web/web_state:error_translation_util",
+ "//ios/web/web_state/js:script_util",
"//testing/gtest",
"//ui/base",
"//url",
diff --git a/chromium/ios/web/public/test/fakes/BUILD.gn b/chromium/ios/web/public/test/fakes/BUILD.gn
index 5b742245e12..59ef2115680 100644
--- a/chromium/ios/web/public/test/fakes/BUILD.gn
+++ b/chromium/ios/web/public/test/fakes/BUILD.gn
@@ -24,6 +24,8 @@ source_set("fakes") {
]
sources = [
+ "crw_fake_web_state_policy_decider.h",
+ "crw_fake_web_state_policy_decider.mm",
"crw_test_js_injection_receiver.h",
"crw_test_js_injection_receiver.mm",
"crw_test_web_state_observer.h",
diff --git a/chromium/ios/web/web_state/BUILD.gn b/chromium/ios/web/web_state/BUILD.gn
index 1b082ad2f3f..ca6aed159c8 100644
--- a/chromium/ios/web/web_state/BUILD.gn
+++ b/chromium/ios/web/web_state/BUILD.gn
@@ -33,6 +33,7 @@ source_set("web_state") {
"web_state_observer.mm",
"web_state_observer_bridge.mm",
"web_state_policy_decider.mm",
+ "web_state_policy_decider_bridge.mm",
]
libs = [ "WebKit.framework" ]
@@ -166,6 +167,7 @@ source_set("context_menu") {
source_set("web_frame") {
deps = [
"//base",
+ "//crypto",
"//ios/web/public",
"//url",
]
diff --git a/chromium/ios/web/web_state/js/BUILD.gn b/chromium/ios/web/web_state/js/BUILD.gn
index 1f7930eefb1..de76bc5b850 100644
--- a/chromium/ios/web/web_state/js/BUILD.gn
+++ b/chromium/ios/web/web_state/js/BUILD.gn
@@ -6,6 +6,7 @@ import("//ios/build/config.gni")
source_set("js") {
deps = [
+ ":script_util",
"//base",
"//ios/web/public",
"//ios/web/web_state/ui:crw_wk_script_message_router",
@@ -18,6 +19,18 @@ source_set("js") {
"crw_js_post_request_loader.mm",
"crw_js_window_id_manager.h",
"crw_js_window_id_manager.mm",
+ ]
+
+ configs += [ "//build/config/compiler:enable_arc" ]
+}
+
+source_set("script_util") {
+ deps = [
+ "//base",
+ "//ios/web/public",
+ ]
+
+ sources = [
"page_script_util.h",
"page_script_util.mm",
]
diff --git a/chromium/ios/web/web_state/ui/BUILD.gn b/chromium/ios/web/web_state/ui/BUILD.gn
index c7092aa638b..142e016a149 100644
--- a/chromium/ios/web/web_state/ui/BUILD.gn
+++ b/chromium/ios/web/web_state/ui/BUILD.gn
@@ -31,6 +31,7 @@ source_set("ui") {
"//ios/web/web_state/js",
"//ios/web/web_state/ui:wk_web_view_configuration_provider",
"//ios/web/webui:webui",
+ "//services/metrics/public/cpp:ukm_builders",
"//ui/base",
"//url",
]
@@ -111,6 +112,7 @@ source_set("wk_web_view_configuration_provider") {
"//base",
"//ios/web/public",
"//ios/web/web_state/js",
+ "//ios/web/web_state/js:script_util",
]
sources = [
View Lorry Controller Status