Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(406)

Unified Diff: ios/web/BUILD.gn

Issue 2260023004: [ARC] [Split this CL] Convert ios/web/webui to ARC. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ios-web-net
Patch Set: Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ios/web/webui/crw_web_ui_manager.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/web/BUILD.gn
diff --git a/ios/web/BUILD.gn b/ios/web/BUILD.gn
index 6cb370a9d86f2492698c570c081bd062d51dd5c3..0f2962d69b0e6f0d22978db3d85c226098ab9110 100644
--- a/ios/web/BUILD.gn
+++ b/ios/web/BUILD.gn
@@ -7,6 +7,34 @@ import("//ios/web/js_compile.gni")
import("//testing/test.gni")
import("//tools/grit/grit_rule.gni")
+source_set("web_arc_transition") {
+ 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",
+ ]
+
+ sources = []
+
+ libs = [ "WebKit.framework" ]
+
+ cflags_objcc = [ "-ccc-arcmt-modify" ]
+}
+
source_set("web_arc") {
deps = [
":core",
@@ -28,6 +56,12 @@ source_set("web_arc") {
"//url",
]
+ allow_circular_includes_from = [ ":web_arc_transition" ]
+
+ public_deps = [
+ ":web_arc_transition",
+ ]
+
sources = [
"active_state_manager_impl.h",
"active_state_manager_impl.mm",
@@ -99,6 +133,31 @@ source_set("web_arc") {
"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" ]
@@ -129,6 +188,7 @@ source_set("web") {
public_deps = [
":web_arc",
+ ":web_arc_transition",
]
sources = [
@@ -270,36 +330,14 @@ source_set("web") {
"web_state/web_view_internal_creation_util.mm",
"web_state/wk_web_view_security_util.h",
"web_state/wk_web_view_security_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" ]
- allow_circular_includes_from = [ ":web_arc" ]
+ allow_circular_includes_from = [
+ ":web_arc",
+ ":web_arc_transition",
+ ]
}
source_set("core") {
« no previous file with comments | « no previous file | ios/web/webui/crw_web_ui_manager.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698