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

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

Issue 2629443002: [Signin iOS] Update title in merging data dialog (Closed)
Patch Set: 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') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 0d126efb865ff5f9ea8b3e8f739c8cae496dd225..cdef4a75f10a90764c84107eb5e0e10c36f4ba1e 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
@@ -15,6 +15,7 @@
#import "ios/chrome/browser/ui/collection_view/collection_view_model.h"
#import "ios/chrome/browser/ui/settings/cells/card_multiline_item.h"
#import "ios/chrome/browser/ui/settings/cells/import_data_multiline_detail_cell.h"
+#include "ios/chrome/grit/ios_chromium_strings.h"
lpromero 2017/01/12 11:47:55 Do you need to also include the google_chrome vers
sdefresne 2017/01/12 11:55:25 No, the convention is to just include the chromium
lpromero 2017/01/12 12:10:43 Ack. Thanks!
#include "ios/chrome/grit/ios_strings.h"
#import "ios/third_party/material_components_ios/src/components/CollectionCells/src/MaterialCollectionCells.h"
#import "ios/third_party/material_components_ios/src/components/Collections/src/MaterialCollections.h"
@@ -67,6 +68,10 @@ typedef NS_ENUM(NSInteger, ItemType) {
_isSignedIn = isSignedIn;
_shouldClearData = isSignedIn ? SHOULD_CLEAR_DATA_CLEAR_DATA
: SHOULD_CLEAR_DATA_MERGE_DATA;
+ self.title =
+ isSignedIn
+ ? l10n_util::GetNSString(IDS_IOS_OPTIONS_IMPORT_DATA_TITLE_SWITCH)
+ : l10n_util::GetNSString(IDS_IOS_OPTIONS_IMPORT_DATA_TITLE_SIGNIN);
[self setShouldHideDoneButton:YES];
self.navigationItem.rightBarButtonItem = [[[UIBarButtonItem alloc]
initWithTitle:l10n_util::GetNSString(
« no previous file with comments | « ios/chrome/app/strings/ios_strings.grd ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698