summaryrefslogtreecommitdiff
path: root/chromium/ios/chrome/app
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/ios/chrome/app')
-rw-r--r--chromium/ios/chrome/app/BUILD.gn77
-rw-r--r--chromium/ios/chrome/app/application_delegate/BUILD.gn13
-rw-r--r--chromium/ios/chrome/app/startup/BUILD.gn1
3 files changed, 66 insertions, 25 deletions
diff --git a/chromium/ios/chrome/app/BUILD.gn b/chromium/ios/chrome/app/BUILD.gn
index 0d6f14bfd02..0a1c2afb580 100644
--- a/chromium/ios/chrome/app/BUILD.gn
+++ b/chromium/ios/chrome/app/BUILD.gn
@@ -10,7 +10,6 @@ import("//ios/build/chrome_build.gni")
import("//ios/build/config.gni")
import("//ios/chrome/features.gni")
import("//ios/public/provider/chrome/browser/build_config.gni")
-import("//ios/third_party/features.gni")
source_set("app") {
configs += [ "//build/config/compiler:enable_arc" ]
@@ -49,6 +48,7 @@ source_set("unit_tests") {
"//components/prefs",
"//ios/chrome/app/application_delegate:application_delegate_internal",
"//ios/chrome/app/application_delegate:tab_opening",
+ "//ios/chrome/app/application_delegate:url_opener_params",
"//ios/chrome/browser",
"//ios/chrome/browser/browser_state:test_support",
"//ios/chrome/browser/tabs",
@@ -59,6 +59,7 @@ source_set("unit_tests") {
"//ios/public/provider/chrome/browser:test_support",
"//ios/public/provider/chrome/browser/distribution",
"//ios/testing:block_swizzler",
+ "//ios/third_party/material_components_ios",
"//ios/web/public/test:test",
"//testing/gtest",
"//third_party/ocmock",
@@ -95,6 +96,12 @@ tweak_info_plist("info_plist") {
} else if (ios_enable_scene_startup) {
info_plists += [ "resources/MultiWindowDisabled+Info.plist" ]
}
+ if (ios_chrome_info_plist_addition_targets != []) {
+ if (!defined(deps)) {
+ deps = []
+ }
+ deps += ios_chrome_info_plist_addition_targets
+ }
args = [
"--breakpad=$breakpad_enabled_as_int",
"--branding=$chromium_short_name",
@@ -130,6 +137,7 @@ source_set("app_internal") {
deps = [
":app",
+ ":blocking_scene_commands",
":mode",
":tests_hook",
"//base",
@@ -162,6 +170,7 @@ source_set("app_internal") {
"//ios/chrome/app/application_delegate",
"//ios/chrome/app/application_delegate:application_delegate_internal",
"//ios/chrome/app/application_delegate:tab_opening",
+ "//ios/chrome/app/application_delegate:url_opener_params",
"//ios/chrome/app/intents",
"//ios/chrome/app/spotlight",
"//ios/chrome/app/startup",
@@ -176,6 +185,7 @@ source_set("app_internal") {
"//ios/chrome/browser/crash_report:crash_report_internal",
"//ios/chrome/browser/crash_report/breadcrumbs",
"//ios/chrome/browser/crash_report/breadcrumbs:feature_flags",
+ "//ios/chrome/browser/credential_provider",
"//ios/chrome/browser/download",
"//ios/chrome/browser/external_files",
"//ios/chrome/browser/favicon",
@@ -258,6 +268,13 @@ source_set("app_internal") {
]
}
+source_set("blocking_scene_commands") {
+ configs += [ "//build/config/compiler:enable_arc" ]
+ sources = [ "blocking_scene_commands.h" ]
+
+ deps = [ "//base" ]
+}
+
source_set("mode") {
configs += [ "//build/config/compiler:enable_arc" ]
sources = [ "application_mode.h" ]
@@ -279,21 +296,33 @@ source_set("main") {
"//ios/testing/perf:startup",
]
- if (ios_third_party_material_components_built_as_framework) {
- if (ios_chrome_links_with_material_components_framework) {
- deps += [
- "//ios/third_party/material_components_ios:material_components_ios+bundle",
- "//ios/third_party/material_components_ios:material_components_ios+link",
- ]
- } else {
- assert_no_deps = [
- "//ios/third_party/material_components_ios:material_components_ios+bundle",
- "//ios/third_party/material_components_ios:material_components_ios+link",
- ]
- }
+ if (ios_chrome_links_with_material_components_framework) {
+ deps += [
+ "//ios/third_party/material_components_ios:material_components_ios+bundle",
+ "//ios/third_party/material_components_ios:material_components_ios+link",
+ ]
+ } else {
+ assert_no_deps = [
+ "//ios/third_party/material_components_ios:material_components_ios+bundle",
+ "//ios/third_party/material_components_ios:material_components_ios+link",
+ ]
}
}
+source_set("multitasking_test_app_delegate") {
+ configs += [ "//build/config/compiler:enable_arc" ]
+ sources = [
+ "multitasking_test_application_delegate.h",
+ "multitasking_test_application_delegate.mm",
+ ]
+ deps = [
+ ":app_internal",
+ "//base",
+ "//ios/chrome/app/application_delegate:application_delegate_internal",
+ "//ios/third_party/material_components_ios",
+ ]
+}
+
ios_app_bundle("chrome") {
output_name = chromium_short_name
@@ -350,18 +379,16 @@ ios_app_bundle("chrome") {
assert_no_deps = ios_assert_no_deps + ios_chrome_extra_assert_no_deps
- if (ios_third_party_material_components_built_as_framework) {
- if (ios_chrome_links_with_material_components_framework) {
- deps += [
- "//ios/third_party/material_components_ios:material_components_ios+bundle",
- "//ios/third_party/material_components_ios:material_components_ios+link",
- ]
- } else {
- assert_no_deps += [
- "//ios/third_party/material_components_ios:material_components_ios+bundle",
- "//ios/third_party/material_components_ios:material_components_ios+link",
- ]
- }
+ if (ios_chrome_links_with_material_components_framework) {
+ deps += [
+ "//ios/third_party/material_components_ios:material_components_ios+bundle",
+ "//ios/third_party/material_components_ios:material_components_ios+link",
+ ]
+ } else {
+ assert_no_deps += [
+ "//ios/third_party/material_components_ios:material_components_ios+bundle",
+ "//ios/third_party/material_components_ios:material_components_ios+link",
+ ]
}
}
diff --git a/chromium/ios/chrome/app/application_delegate/BUILD.gn b/chromium/ios/chrome/app/application_delegate/BUILD.gn
index 27f5d104251..2570282b03d 100644
--- a/chromium/ios/chrome/app/application_delegate/BUILD.gn
+++ b/chromium/ios/chrome/app/application_delegate/BUILD.gn
@@ -33,6 +33,7 @@ source_set("unit_tests") {
"memory_warning_helper_unittest.mm",
"metric_kit_subscriber_unittest.mm",
"metrics_mediator_unittest.mm",
+ "url_opener_params_unittest.mm",
"url_opener_unittest.mm",
"user_activity_handler_unittest.mm",
]
@@ -42,6 +43,7 @@ source_set("unit_tests") {
":metric_kit_subscriber",
":tab_opening",
":test_support",
+ ":url_opener_params",
"//base",
"//base/test:test_support",
"//components/handoff",
@@ -106,6 +108,7 @@ source_set("tab_opening") {
"//base",
"//ios/chrome/app",
"//ios/chrome/app:mode",
+ "//ios/chrome/browser/main:public",
"//ui/base",
]
libs = [
@@ -114,6 +117,15 @@ source_set("tab_opening") {
]
}
+source_set("url_opener_params") {
+ configs += [ "//build/config/compiler:enable_arc" ]
+ sources = [
+ "url_opener_params.h",
+ "url_opener_params.mm",
+ ]
+ deps = [ "//base" ]
+}
+
source_set("metric_kit_subscriber") {
configs += [ "//build/config/compiler:enable_arc" ]
sources = [
@@ -148,6 +160,7 @@ source_set("application_delegate_internal") {
":application_delegate",
":ios_enable_metrickit_buildflags",
":tab_opening",
+ ":url_opener_params",
"//base",
"//build:branding_buildflags",
"//components/crash/core/common",
diff --git a/chromium/ios/chrome/app/startup/BUILD.gn b/chromium/ios/chrome/app/startup/BUILD.gn
index 3920120813d..16573b0e110 100644
--- a/chromium/ios/chrome/app/startup/BUILD.gn
+++ b/chromium/ios/chrome/app/startup/BUILD.gn
@@ -55,6 +55,7 @@ source_set("startup") {
"//ios/chrome/browser/first_run",
"//ios/chrome/browser/net:net",
"//ios/chrome/browser/ntp_snippets",
+ "//ios/chrome/browser/ui/whats_new:utils",
"//ios/chrome/browser/web:web_internal",
"//ios/chrome/common",
"//ios/chrome/common/app_group",
View Lorry Controller Status