Commit 1c9bf155 authored by Eugene But's avatar Eugene But Committed by Commit Bot

Break up ios/web/navigation:core into smaller targets.

Dependencies refactoring in a preparation for storing pending navigation
item in NavigationContext.

This CL extracts wk_navigation_util and navigation_manager_util from
core as separate targets. Breaking up core into smaller targets will
allow navigation_manager_util to depend on
ios/web/web_state:navigation_context without having a circular
dependency (navigation_context currently depends on core).

navigation_manager_util needs to depend on navigation_context in
http://crrev.com/c/1455658/25/ios/web/navigation/navigation_manager_util.mm#10

Bug: 899827
Change-Id: I1aa72fc156ab23aac9124c70ebc5a36b619a6b0c
Reviewed-on: https://chromium-review.googlesource.com/c/1486684
Commit-Queue: Justin Cohen <justincohen@chromium.org>
Auto-Submit: Eugene But <eugenebut@chromium.org>
Reviewed-by: default avatarJustin Cohen <justincohen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#635568}
parent c5562238
...@@ -234,6 +234,8 @@ source_set("ios_web_navigation_unittests") { ...@@ -234,6 +234,8 @@ source_set("ios_web_navigation_unittests") {
"//ios/testing:ocmock_support", "//ios/testing:ocmock_support",
"//ios/web/navigation", "//ios/web/navigation",
"//ios/web/navigation:core", "//ios/web/navigation:core",
"//ios/web/navigation:navigation_manager_util",
"//ios/web/navigation:wk_navigation_util",
"//ios/web/public", "//ios/web/public",
"//ios/web/public/test", "//ios/web/public/test",
"//ios/web/public/test/fakes", "//ios/web/public/test/fakes",
...@@ -241,6 +243,7 @@ source_set("ios_web_navigation_unittests") { ...@@ -241,6 +243,7 @@ source_set("ios_web_navigation_unittests") {
"//ios/web/test:test_constants", "//ios/web/test:test_constants",
"//ios/web/test:test_support", "//ios/web/test:test_support",
"//ios/web/test/fakes", "//ios/web/test/fakes",
"//ios/web/web_state:navigation_context",
"//ios/web/web_state/ui:crw_web_view_navigation_proxy", "//ios/web/web_state/ui:crw_web_view_navigation_proxy",
"//net:test_support", "//net:test_support",
"//services/service_manager/public/cpp", "//services/service_manager/public/cpp",
...@@ -378,6 +381,7 @@ source_set("ios_web_web_state_unittests") { ...@@ -378,6 +381,7 @@ source_set("ios_web_web_state_unittests") {
"//ios/web", "//ios/web",
"//ios/web/interstitials", "//ios/web/interstitials",
"//ios/web/navigation", "//ios/web/navigation",
"//ios/web/navigation:wk_navigation_util",
"//ios/web/public", "//ios/web/public",
"//ios/web/public/test", "//ios/web/public/test",
"//ios/web/public/test/fakes", "//ios/web/public/test/fakes",
...@@ -566,6 +570,7 @@ test("ios_web_inttests") { ...@@ -566,6 +570,7 @@ test("ios_web_inttests") {
"//ios/web:resources_grit", "//ios/web:resources_grit",
"//ios/web/download:download_inttests", "//ios/web/download:download_inttests",
"//ios/web/navigation:core", "//ios/web/navigation:core",
"//ios/web/navigation:wk_navigation_util",
"//ios/web/public/find_in_page", "//ios/web/public/find_in_page",
"//ios/web/public/test", "//ios/web/public/test",
"//ios/web/public/test/fakes", "//ios/web/public/test/fakes",
......
...@@ -9,6 +9,7 @@ source_set("navigation") { ...@@ -9,6 +9,7 @@ source_set("navigation") {
":core", ":core",
"//base", "//base",
"//ios/web:core", "//ios/web:core",
"//ios/web/navigation:wk_navigation_util",
"//ios/web/public", "//ios/web/public",
"//ios/web/web_state:session_certificate_policy_cache", "//ios/web/web_state:session_certificate_policy_cache",
"//ios/web/web_state:web_state_impl_header", "//ios/web/web_state:web_state_impl_header",
...@@ -48,6 +49,7 @@ source_set("core") { ...@@ -48,6 +49,7 @@ source_set("core") {
deps = [ deps = [
"//base", "//base",
"//components/url_formatter:url_formatter", "//components/url_formatter:url_formatter",
"//ios/web/navigation:wk_navigation_util",
"//ios/web/public", "//ios/web/public",
"//ui/base", "//ui/base",
] ]
...@@ -60,11 +62,38 @@ source_set("core") { ...@@ -60,11 +62,38 @@ source_set("core") {
"navigation_manager_delegate.h", "navigation_manager_delegate.h",
"navigation_manager_impl.h", "navigation_manager_impl.h",
"navigation_manager_impl.mm", "navigation_manager_impl.mm",
"navigation_manager_util.h", ]
"navigation_manager_util.mm",
configs += [ "//build/config/compiler:enable_arc" ]
}
source_set("wk_navigation_util") {
deps = [
"//base",
"//ios/web/public",
"//url",
]
sources = [
"wk_navigation_util.h", "wk_navigation_util.h",
"wk_navigation_util.mm", "wk_navigation_util.mm",
] ]
configs += [ "//build/config/compiler:enable_arc" ] configs += [ "//build/config/compiler:enable_arc" ]
} }
source_set("navigation_manager_util") {
deps = [
"//base",
"//ios/web/navigation:core",
"//ios/web/public",
"//ios/web/web_state:navigation_context",
]
sources = [
"navigation_manager_util.h",
"navigation_manager_util.mm",
]
configs += [ "//build/config/compiler:enable_arc" ]
}
...@@ -10,6 +10,8 @@ source_set("net") { ...@@ -10,6 +10,8 @@ source_set("net") {
"//ios/net", "//ios/net",
"//ios/web:core", "//ios/web:core",
"//ios/web/navigation:core", "//ios/web/navigation:core",
"//ios/web/navigation:navigation_manager_util",
"//ios/web/navigation:wk_navigation_util",
"//ios/web/public", "//ios/web/public",
"//ios/web/web_state:wk_web_view_security_util", "//ios/web/web_state:wk_web_view_security_util",
"//net", "//net",
......
...@@ -15,6 +15,7 @@ source_set("test") { ...@@ -15,6 +15,7 @@ source_set("test") {
"//base", "//base",
"//base/test:test_support", "//base/test:test_support",
"//ios/web:web", "//ios/web:web",
"//ios/web/navigation:wk_navigation_util",
"//ios/web/test:test_support", "//ios/web/test:test_support",
"//testing/gtest", "//testing/gtest",
"//ui/base", "//ui/base",
......
...@@ -15,6 +15,7 @@ source_set("web_state") { ...@@ -15,6 +15,7 @@ source_set("web_state") {
"//ios/web/interstitials", "//ios/web/interstitials",
"//ios/web/navigation", "//ios/web/navigation",
"//ios/web/navigation:core", "//ios/web/navigation:core",
"//ios/web/navigation:wk_navigation_util",
"//ios/web/public", "//ios/web/public",
"//ios/web/web_state/ui", "//ios/web/web_state/ui",
"//ios/web/web_state/ui:crw_web_view_navigation_proxy", "//ios/web/web_state/ui:crw_web_view_navigation_proxy",
......
...@@ -27,6 +27,8 @@ source_set("ui") { ...@@ -27,6 +27,8 @@ source_set("ui") {
"//ios/web/interstitials", "//ios/web/interstitials",
"//ios/web/navigation", "//ios/web/navigation",
"//ios/web/navigation:core", "//ios/web/navigation:core",
"//ios/web/navigation:navigation_manager_util",
"//ios/web/navigation:wk_navigation_util",
"//ios/web/net:net", "//ios/web/net:net",
"//ios/web/public", "//ios/web/public",
"//ios/web/public/download", "//ios/web/public/download",
...@@ -82,6 +84,7 @@ source_set("crw_wk_script_message_router") { ...@@ -82,6 +84,7 @@ source_set("crw_wk_script_message_router") {
deps = [ deps = [
"//base", "//base",
"//ios/web/navigation:core", "//ios/web/navigation:core",
"//ios/web/navigation:wk_navigation_util",
"//net", "//net",
] ]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment