From 3c2b14e4cbc907583011cf2c227e7bff57c1ec6c Mon Sep 17 00:00:00 2001 From: Nohemi Fernandez Date: Tue, 14 Apr 2020 08:51:25 +0000 Subject: [PATCH] [iOS] Remove unused constants for first run view controller. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use the accessibility label directly in the first run EarlGrey tests. This makes it simpler to transition to the new sign-in architecture. See go/chrome-ios-signin-migration for more details. Bug: 1005509 Change-Id: I4afa65b02169927c919cb51dd9884bb828a55fd8 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2144082 Reviewed-by: Jérôme Lebel Commit-Queue: Nohemi Fernandez Cr-Commit-Position: refs/heads/master@{#758767} --- .../ui/first_run/first_run_chrome_signin_view_controller.mm | 4 ---- ios/chrome/browser/ui/first_run/first_run_constants.h | 4 ---- ios/chrome/browser/ui/first_run/first_run_constants.mm | 4 ---- ios/chrome/browser/ui/first_run/first_run_egtest.mm | 4 ++-- 4 files changed, 2 insertions(+), 14 deletions(-) diff --git a/ios/chrome/browser/ui/first_run/first_run_chrome_signin_view_controller.mm b/ios/chrome/browser/ui/first_run/first_run_chrome_signin_view_controller.mm index 51fdee1ec6422f..5036f06753d5ab 100644 --- a/ios/chrome/browser/ui/first_run/first_run_chrome_signin_view_controller.mm +++ b/ios/chrome/browser/ui/first_run/first_run_chrome_signin_view_controller.mm @@ -72,10 +72,6 @@ - (instancetype)initWithBrowser:(Browser*)browser - (void)viewDidLoad { [super viewDidLoad]; [self.navigationController setNavigationBarHidden:YES]; - self.primaryButton.accessibilityIdentifier = - first_run::kSignInButtonAccessibilityIdentifier; - self.secondaryButton.accessibilityIdentifier = - first_run::kSignInSkipButtonAccessibilityIdentifier; } - (void)viewDidAppear:(BOOL)animated { diff --git a/ios/chrome/browser/ui/first_run/first_run_constants.h b/ios/chrome/browser/ui/first_run/first_run_constants.h index 28bab176e4f024..cd17e04581f199 100644 --- a/ios/chrome/browser/ui/first_run/first_run_constants.h +++ b/ios/chrome/browser/ui/first_run/first_run_constants.h @@ -9,10 +9,6 @@ namespace first_run { -// The accessibility identifier for the sign in button shown in first run. -extern NSString* const kSignInButtonAccessibilityIdentifier; -// The accessibility identifier for the skip sign in button shown in first run. -extern NSString* const kSignInSkipButtonAccessibilityIdentifier; // The accessibility identifier for the UMA collection checkbox shown in first // run. extern NSString* const kUMAMetricsButtonAccessibilityIdentifier; diff --git a/ios/chrome/browser/ui/first_run/first_run_constants.mm b/ios/chrome/browser/ui/first_run/first_run_constants.mm index c7a5d750927fe6..40276c92dd5417 100644 --- a/ios/chrome/browser/ui/first_run/first_run_constants.mm +++ b/ios/chrome/browser/ui/first_run/first_run_constants.mm @@ -10,10 +10,6 @@ namespace first_run { -NSString* const kSignInButtonAccessibilityIdentifier = - @"SignInButtonAccessibilityIdentifier"; -NSString* const kSignInSkipButtonAccessibilityIdentifier = - @"SkipButtonAccessibilityIdentifier"; NSString* const kUMAMetricsButtonAccessibilityIdentifier = @"UMAMetricsButtonAccessibilityIdentifier"; diff --git a/ios/chrome/browser/ui/first_run/first_run_egtest.mm b/ios/chrome/browser/ui/first_run/first_run_egtest.mm index 0e21990f19054a..6d7769f24473e0 100644 --- a/ios/chrome/browser/ui/first_run/first_run_egtest.mm +++ b/ios/chrome/browser/ui/first_run/first_run_egtest.mm @@ -32,8 +32,8 @@ // Returns matcher for the skip sign in button. id SkipSigninButton() { - return grey_accessibilityID( - first_run::kSignInSkipButtonAccessibilityIdentifier); + return ButtonWithAccessibilityLabel( + l10n_util::GetNSString(IDS_IOS_FIRSTRUN_ACCOUNT_CONSISTENCY_SKIP_BUTTON)); } }