[Signin iOS] Update title in merging data dialog

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "ios/chrome/browser/ui/settings/import_data_collection_view_controller.h"
 
 #import "base/ios/weak_nsobject.h"
 #include "base/logging.h"
 #import "base/mac/foundation_util.h"
 #import "base/mac/scoped_nsobject.h"
 #include "base/strings/sys_string_conversions.h"
 #import "ios/chrome/browser/ui/collection_view/cells/MDCCollectionViewCell+Chrome.h"
 #import "ios/chrome/browser/ui/collection_view/cells/collection_view_detail_item.h"
 #import "ios/chrome/browser/ui/collection_view/cells/collection_view_item.h"
 #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 version? For branded builds?

[sdefresne, 2017/01/12 11:55:25]

No, the convention is to just include the chromium one.

[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"
 #include "ui/base/l10n/l10n_util_mac.h"
 
 // The accessibility identifier of the Import Data cell.
 NSString* const kImportDataImportCellId = @"kImportDataImportCellId";
 // The accessibility identifier of the Keep Data Separate cell.
 NSString* const kImportDataKeepSeparateCellId =
     @"kImportDataKeepSeparateCellId";
@@ skipping 32 matching lines @@
   DCHECK(fromEmail);
   DCHECK(toEmail);
   self = [super initWithStyle:CollectionViewControllerStyleAppBar];
   if (self) {
     _delegate.reset(delegate);
     _fromEmail.reset([fromEmail copy]);
     _toEmail.reset([toEmail copy]);
     _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(
                           IDS_IOS_OPTIONS_IMPORT_DATA_CONTINUE_BUTTON)
                 style:UIBarButtonItemStyleDone
                target:self
                action:@selector(didTapContinue)] autorelease];
     [self loadModel];
   }
   return self;
@@ skipping 112 matching lines @@
                          : MDCCollectionViewCellAccessoryCheckmark;
   [self reconfigureCellsForItems:@[ _importDataItem, _keepDataSeparateItem ]
          inSectionWithIdentifier:SectionIdentifierOptions];
 }
 
 - (void)didTapContinue {
   [_delegate didChooseClearDataPolicy:self shouldClearData:_shouldClearData];
 }
 
 @end