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

Unified Diff: chrome/browser/chromeos/BUILD.gn

Issue 2561023002: arc: ARC loading progress should not be shown when started from OOBE. (Closed)
Patch Set: rebased + comments updated Created 3 years, 11 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 | chrome/browser/chromeos/arc/arc_session_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/BUILD.gn
diff --git a/chrome/browser/chromeos/BUILD.gn b/chrome/browser/chromeos/BUILD.gn
index a181786a6bab0fdce476cc5155a5f2c0af80f950..f61d1bb74644be762ba39838d69f4dbcb6ddbc7b 100644
--- a/chrome/browser/chromeos/BUILD.gn
+++ b/chrome/browser/chromeos/BUILD.gn
@@ -283,8 +283,12 @@ source_set("chromeos") {
"arc/optin/arc_optin_preference_handler.cc",
"arc/optin/arc_optin_preference_handler.h",
"arc/optin/arc_optin_preference_handler_delegate.h",
+ "arc/optin/arc_terms_of_service_default_negotiator.cc",
+ "arc/optin/arc_terms_of_service_default_negotiator.h",
"arc/optin/arc_terms_of_service_negotiator.cc",
"arc/optin/arc_terms_of_service_negotiator.h",
+ "arc/optin/arc_terms_of_service_oobe_negotiator.cc",
+ "arc/optin/arc_terms_of_service_oobe_negotiator.h",
"arc/policy/arc_android_management_checker.cc",
"arc/policy/arc_android_management_checker.h",
"arc/policy/arc_android_management_checker_delegate.h",
@@ -762,6 +766,7 @@ source_set("chromeos") {
"login/screens/arc_terms_of_service_screen.cc",
"login/screens/arc_terms_of_service_screen.h",
"login/screens/arc_terms_of_service_screen_actor.h",
+ "login/screens/arc_terms_of_service_screen_actor_observer.h",
"login/screens/base_screen.cc",
"login/screens/base_screen.h",
"login/screens/base_screen_delegate.h",
@@ -1436,6 +1441,15 @@ source_set("chromeos") {
}
}
+static_library("arc_test_support") {
+ testonly = true
+
+ sources = [
+ "arc/test/arc_data_removed_waiter.cc",
+ "arc/test/arc_data_removed_waiter.h",
+ ]
+}
+
source_set("unit_tests") {
testonly = true
@@ -1469,7 +1483,7 @@ source_set("unit_tests") {
"arc/fileapi/arc_documents_provider_util_unittest.cc",
"arc/intent_helper/arc_external_protocol_dialog_unittest.cc",
"arc/intent_helper/arc_navigation_throttle_unittest.cc",
- "arc/optin/arc_terms_of_service_negotiator_unittest.cc",
+ "arc/optin/arc_terms_of_service_default_negotiator_unittest.cc",
"arc/policy/arc_policy_bridge_unittest.cc",
"attestation/attestation_ca_client_unittest.cc",
"attestation/attestation_policy_observer_unittest.cc",
@@ -1702,6 +1716,7 @@ source_set("unit_tests") {
":chromeos",
]
deps = [
+ ":arc_test_support",
":attestation_proto",
":device_policy_proto",
"//ash/resources",
« no previous file with comments | « no previous file | chrome/browser/chromeos/arc/arc_session_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698