[SendTabToSelf][ios] add device name to send confirmation

Bug: 986536
Change-Id: Idcdd36bfe4db04422c12629a7252aae479819671
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1715744Reviewed-by: Peter Lee <pkl@chromium.org>
Commit-Queue: Jeffrey Cohen <jeffreycohen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#680484}

ios/chrome/app/strings/ios_strings.grd

@@ -1506,7 +1506,7 @@ Handoff must also be enabled in the General section of Settings, and your device
         Send To Your Devices
       </message>
       <message name="IDS_IOS_SEND_TAB_TO_SELF_SNACKBAR_MESSAGE" desc="Message briefly displayed at the bottom of the screen to the user to inform that the tab is being sent to the target device. [Length: 35em]" meaning="The is being sent to the target device. [Length: 35em]">
-        Sending...
+        Sending to <ph name="DEVICE_NAME">$1<ex>IPhone</ex></ph>...
       </message>
       <message name="IDS_IOS_SEND_TAB_TO_SELF_TARGET_DEVICE_ACTION" desc="Button label for the Send Tab To Self modal dialog that sends the current tab to a user's other device. [iOS only]">
         Send To Your Device

ios/chrome/browser/ui/browser_view/browser_view_controller.mm

@@ -747,7 +747,8 @@ NSString* const kBrowserViewControllerSnackbarCategory =
 // Send Tab To Self
 // ----------------
 // Sends the current tab to the target device.
-- (void)sendTabToSelfTargetDeviceID:(NSString*)targetDeviceID;
+- (void)sendTabToSelfTargetDeviceID:(NSString*)targetDeviceID
+                   targetDeviceName:(NSString*)targetDeviceName;
 
 @end
 
@@ -2896,14 +2897,16 @@ NSString* const kBrowserViewControllerSnackbarCategory =
 
 #pragma mark - Private Methods: Send Tab To Self
 
-- (void)sendTabToSelfTargetDeviceID:(NSString*)targetDeviceID {
+- (void)sendTabToSelfTargetDeviceID:(NSString*)targetDeviceID
+                   targetDeviceName:(NSString*)targetDeviceName {
   send_tab_to_self::CreateNewEntry(_browserState, targetDeviceID);
 
   [self.dispatcher triggerToolsMenuButtonAnimation];
 
   TriggerHapticFeedbackForNotification(UINotificationFeedbackTypeSuccess);
-  [self showSnackbar:l10n_util::GetNSString(
-                         IDS_IOS_SEND_TAB_TO_SELF_SNACKBAR_MESSAGE)];
+  [self showSnackbar:l10n_util::GetNSStringF(
+                         IDS_IOS_SEND_TAB_TO_SELF_SNACKBAR_MESSAGE,
+                         base::SysNSStringToUTF16(targetDeviceName))];
 }
 
 #pragma mark - ** Protocol Implementations and Helpers **
@@ -4388,7 +4391,8 @@ NSString* const kBrowserViewControllerSnackbarCategory =
 }
 
 - (void)sendTabToSelf:(SendTabToSelfCommand*)command {
-  [self sendTabToSelfTargetDeviceID:[command targetDeviceID]];
+  [self sendTabToSelfTargetDeviceID:[command targetDeviceID]
+                   targetDeviceName:[command targetDeviceName]];
 }
 
 #pragma mark - FindInPageResponseDelegate

ios/chrome/browser/ui/commands/send_tab_to_self_command.h

@@ -10,10 +10,12 @@
 @interface SendTabToSelfCommand : NSObject
 
 @property(copy, nonatomic, readonly) NSString* targetDeviceID;
+@property(copy, nonatomic, readonly) NSString* targetDeviceName;
 
 - (instancetype)init NS_UNAVAILABLE;
 
 - (instancetype)initWithTargetDeviceID:(NSString*)targetDeviceID
+                      targetDeviceName:(NSString*)targetDeviceName
     NS_DESIGNATED_INITIALIZER;
 
 @end

ios/chrome/browser/ui/commands/send_tab_to_self_command.mm

@@ -11,10 +11,13 @@
 @implementation SendTabToSelfCommand
 
 @synthesize targetDeviceID = _targetDeviceID;
+@synthesize targetDeviceName = _targetDeviceName;
 
-- (instancetype)initWithTargetDeviceID:(NSString*)targetDeviceID {
+- (instancetype)initWithTargetDeviceID:(NSString*)targetDeviceID
+                      targetDeviceName:(NSString*)targetDeviceName {
   if (self = [super init]) {
     _targetDeviceID = [targetDeviceID copy];
+    _targetDeviceName = [targetDeviceName copy];
   }
   return self;
 }

ios/chrome/browser/ui/send_tab_to_self/send_tab_to_self_coordinator.mm

@@ -105,10 +105,12 @@
   [self stop];
 }
 
-- (void)sendTabToTargetDeviceCacheGUID:(NSString*)cacheGUID {
+- (void)sendTabToTargetDeviceCacheGUID:(NSString*)cacheGUID
+                      targetDeviceName:(NSString*)deviceName {
   // TODO(crbug.com/970284) log histogram of send event.
   SendTabToSelfCommand* command =
-      [[SendTabToSelfCommand alloc] initWithTargetDeviceID:cacheGUID];
+      [[SendTabToSelfCommand alloc] initWithTargetDeviceID:cacheGUID
+                                          targetDeviceName:deviceName];
 
   [self.dispatcher sendTabToSelf:command];
   [self stop];

ios/chrome/browser/ui/send_tab_to_self/send_tab_to_self_modal_delegate.h

@@ -15,7 +15,8 @@
                            completion:(void (^)())completion;
 
 // Asks the delegate to send the current tab to the device with |cacheGuid|.
-- (void)sendTabToTargetDeviceCacheGUID:(NSString*)cacheGuid;
+- (void)sendTabToTargetDeviceCacheGUID:(NSString*)cacheGuid
+                      targetDeviceName:(NSString*)deviceName;
 
 @end
 

ios/chrome/browser/ui/send_tab_to_self/send_tab_to_self_table_view_controller.mm

@@ -236,7 +236,8 @@ typedef NS_ENUM(NSInteger, ItemType) {
 - (void)sendTabWhenPressed:(UIButton*)sender {
   base::UmaHistogramEnumeration(kClickResultHistogramName,
                                 SendTabToSelfClickResult::kClickItem);
-  [self.delegate sendTabToTargetDeviceCacheGUID:self.selectedItem.cacheGuid];
+  [self.delegate sendTabToTargetDeviceCacheGUID:self.selectedItem.cacheGuid
+                               targetDeviceName:self.selectedItem.text];
   [self.delegate dismissViewControllerAnimated:YES completion:nil];
 }