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

Side by Side Diff: ios/chrome/browser/ui/settings/block_popups_egtest.mm

Issue 2589193002: Revert to the old back arrow style with NavigationBar (Closed)
Patch Set: Created 3 years, 12 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 unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #import <EarlGrey/EarlGrey.h> 5 #import <EarlGrey/EarlGrey.h>
6 #import <UIKit/UIKit.h> 6 #import <UIKit/UIKit.h>
7 #import <XCTest/XCTest.h> 7 #import <XCTest/XCTest.h>
8 8
9 #include "base/ios/ios_util.h" 9 #include "base/ios/ios_util.h"
10 #include "base/strings/sys_string_conversions.h" 10 #include "base/strings/sys_string_conversions.h"
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 performAction:grey_tap()]; 74 performAction:grey_tap()];
75 75
76 [[EarlGrey selectElementWithMatcher:block_popups_button_matcher] 76 [[EarlGrey selectElementWithMatcher:block_popups_button_matcher]
77 performAction:grey_tap()]; 77 performAction:grey_tap()];
78 } 78 }
79 79
80 // Exits out of settings. Must be called from the block popups settings page. 80 // Exits out of settings. Must be called from the block popups settings page.
81 void CloseSettings() { 81 void CloseSettings() {
82 [[EarlGrey 82 [[EarlGrey
83 selectElementWithMatcher:grey_allOf( 83 selectElementWithMatcher:grey_allOf(
84 grey_accessibilityID(@"back_bar_button"), 84 grey_accessibilityID(@"ic_arrow_back"),
85 grey_accessibilityTrait( 85 grey_accessibilityTrait(
86 UIAccessibilityTraitButton), 86 UIAccessibilityTraitButton),
87 nil)] performAction:grey_tap()]; 87 nil)] performAction:grey_tap()];
88 [[EarlGrey 88 [[EarlGrey
89 selectElementWithMatcher:grey_allOf( 89 selectElementWithMatcher:grey_allOf(
90 grey_accessibilityID(@"back_bar_button"), 90 grey_accessibilityID(@"ic_arrow_back"),
91 grey_accessibilityTrait( 91 grey_accessibilityTrait(
92 UIAccessibilityTraitButton), 92 UIAccessibilityTraitButton),
93 nil)] performAction:grey_tap()]; 93 nil)] performAction:grey_tap()];
94 [[EarlGrey 94 [[EarlGrey
95 selectElementWithMatcher:chrome_test_util::buttonWithAccessibilityLabelId( 95 selectElementWithMatcher:chrome_test_util::buttonWithAccessibilityLabelId(
96 IDS_IOS_NAVIGATION_BAR_DONE_BUTTON)] 96 IDS_IOS_NAVIGATION_BAR_DONE_BUTTON)]
97 performAction:grey_tap()]; 97 performAction:grey_tap()];
98 } 98 }
99 99
100 // ScopedBlockPopupsPref modifies the block popups preference and resets the 100 // ScopedBlockPopupsPref modifies the block popups preference and resets the
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
291 assertWithMatcher:grey_sufficientlyVisible()]; 291 assertWithMatcher:grey_sufficientlyVisible()];
292 [[EarlGrey 292 [[EarlGrey
293 selectElementWithMatcher:grey_accessibilityLabel(l10n_util::GetNSString( 293 selectElementWithMatcher:grey_accessibilityLabel(l10n_util::GetNSString(
294 IDS_IOS_NAVIGATION_BAR_EDIT_BUTTON))] 294 IDS_IOS_NAVIGATION_BAR_EDIT_BUTTON))]
295 assertWithMatcher:grey_sufficientlyVisible()]; 295 assertWithMatcher:grey_sufficientlyVisible()];
296 296
297 CloseSettings(); 297 CloseSettings();
298 } 298 }
299 299
300 @end 300 @end
OLDNEW
« no previous file with comments | « ios/chrome/browser/ui/settings/autofill_settings_egtest.mm ('k') | ios/chrome/browser/ui/settings/settings_egtest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698