[Signin iOS] Update title in merging data dialog

[Signin iOS] Update title in merging data dialog

Title should be "Switch Sync Account" when switching, and "Sign in to
Chrome/Chromium" when signing in.

BUG=660418
Review-Url: https://codereview.chromium.org/2629443002
Cr-Commit-Position: refs/heads/master@{#443211}
Committed: https://chromium.googlesource.com/chromium/src/+/0dde99abe4b5d727625320a01e42f1f3fdf667f1

[bzanotti, 2017-01-11 20:23:24]

bzanotti@chromium.org changed reviewers:
+ lpromero@chromium.org

[bzanotti, 2017-01-11 20:23:25]

Please take a look.

[lpromero, 2017-01-12 11:47:55]

lgtm

https://codereview.chromium.org/2629443002/diff/1/ios/chrome/browser/ui/setti...
File ios/chrome/browser/ui/settings/import_data_collection_view_controller.mm
(right):

https://codereview.chromium.org/2629443002/diff/1/ios/chrome/browser/ui/setti...
ios/chrome/browser/ui/settings/import_data_collection_view_controller.mm:18:
#include "ios/chrome/grit/ios_chromium_strings.h"
Do you need to also include the google_chrome version? For branded builds?

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

sdefresne@chromium.org changed reviewers:
+ sdefresne@chromium.org

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

https://codereview.chromium.org/2629443002/diff/1/ios/chrome/browser/ui/setti...
File ios/chrome/browser/ui/settings/import_data_collection_view_controller.mm
(right):

https://codereview.chromium.org/2629443002/diff/1/ios/chrome/browser/ui/setti...
ios/chrome/browser/ui/settings/import_data_collection_view_controller.mm:18:
#include "ios/chrome/grit/ios_chromium_strings.h"
On 2017/01/12 11:47:55, lpromero wrote:
> Do you need to also include the google_chrome version? For branded builds?

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

[bzanotti, 2017-01-12 11:56:17]

The CQ bit was checked by bzanotti@chromium.org

[commit-bot: I haz the power, 2017-01-12 11:56:27]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[lpromero, 2017-01-12 12:10:43]

https://codereview.chromium.org/2629443002/diff/1/ios/chrome/browser/ui/setti...
File ios/chrome/browser/ui/settings/import_data_collection_view_controller.mm
(right):

https://codereview.chromium.org/2629443002/diff/1/ios/chrome/browser/ui/setti...
ios/chrome/browser/ui/settings/import_data_collection_view_controller.mm:18:
#include "ios/chrome/grit/ios_chromium_strings.h"
On 2017/01/12 11:55:25, sdefresne wrote:
> On 2017/01/12 11:47:55, lpromero wrote:
> > Do you need to also include the google_chrome version? For branded builds?
> 
> No, the convention is to just include the chromium one.

Ack. Thanks!

[commit-bot: I haz the power, 2017-01-12 12:23:56]

CQ is committing da patch.

Bot data: {"patchset_id": 1, "attempt_start_ts": 1484222177946290, "parent_rev":
"1f5422af8e58fc0b434a644fff16a82652d234cd", "commit_rev":
"0dde99abe4b5d727625320a01e42f1f3fdf667f1"}

[commit-bot: I haz the power, 2017-01-12 12:24:29]

Description was changed from

==========
[Signin iOS] Update title in merging data dialog

Title should be "Switch Sync Account" when switching, and "Sign in to
Chrome/Chromium" when signing in.

BUG=660418
==========

to

==========
[Signin iOS] Update title in merging data dialog

Title should be "Switch Sync Account" when switching, and "Sign in to
Chrome/Chromium" when signing in.

BUG=660418

Review-Url: https://codereview.chromium.org/2629443002
Cr-Commit-Position: refs/heads/master@{#443211}
Committed:
https://chromium.googlesource.com/chromium/src/+/0dde99abe4b5d727625320a01e42...
==========

[commit-bot: I haz the power, 2017-01-12 12:24:30]

Committed patchset #1 (id:1) as
https://chromium.googlesource.com/chromium/src/+/0dde99abe4b5d727625320a01e42...