ios/chrome/browser/ui/settings/import_data_collection_view_controller.mm - Issue 2616943002: [Signin iOS] Update order of buttons in dialog for merging data

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ios/chrome/browser/ui/settings/import_data_collection_view_controller.mm

Issue 2616943002: [Signin iOS] Update order of buttons in dialog for merging data (Closed)

Patch Set: Fix unit tests 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 | « ios/chrome/app/strings/ios_strings.grd ('k') | ios/chrome/browser/ui/settings/import_data_collection_view_controller_unittest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ios/chrome/browser/ui/settings/import_data_collection_view_controller.mm

diff --git a/ios/chrome/browser/ui/settings/import_data_collection_view_controller.mm b/ios/chrome/browser/ui/settings/import_data_collection_view_controller.mm

index 79f370475ec20edef383e342d71aa4b0a3f86c75..0d126efb865ff5f9ea8b3e8f739c8cae496dd225 100644

--- a/ios/chrome/browser/ui/settings/import_data_collection_view_controller.mm

+++ b/ios/chrome/browser/ui/settings/import_data_collection_view_controller.mm

@@ -67,7 +67,6 @@ typedef NS_ENUM(NSInteger, ItemType) {

_isSignedIn = isSignedIn;

_shouldClearData = isSignedIn ? SHOULD_CLEAR_DATA_CLEAR_DATA

: SHOULD_CLEAR_DATA_MERGE_DATA;

- self.title = l10n_util::GetNSString(IDS_IOS_OPTIONS_IMPORT_DATA_TITLE);

[self setShouldHideDoneButton:YES];

self.navigationItem.rightBarButtonItem = [[[UIBarButtonItem alloc]

initWithTitle:l10n_util::GetNSString(

@@ -92,11 +91,18 @@ typedef NS_ENUM(NSInteger, ItemType) {

[model addSectionWithIdentifier:SectionIdentifierOptions];

_importDataItem.reset([[self importDataItem] retain]);

- [model addItem:_importDataItem

- toSectionWithIdentifier:SectionIdentifierOptions];

_keepDataSeparateItem.reset([[self keepDataSeparateItem] retain]);

- [model addItem:_keepDataSeparateItem

- toSectionWithIdentifier:SectionIdentifierOptions];

+ if (_isSignedIn) {

+ [model addItem:_keepDataSeparateItem

+ toSectionWithIdentifier:SectionIdentifierOptions];

+ [model addItem:_importDataItem

+ toSectionWithIdentifier:SectionIdentifierOptions];

+ } else {

+ [model addItem:_importDataItem

+ toSectionWithIdentifier:SectionIdentifierOptions];

+ [model addItem:_keepDataSeparateItem

+ toSectionWithIdentifier:SectionIdentifierOptions];

+ }

}

#pragma mark Items