Backed out changeset cbd4339e2ca1 (bug 1368145) for failing browser-chrome test browser_contextmenu_sendpage.js. r=backout
authorSebastian Hengst <archaeopteryx@coole-files.de>
Tue, 13 Jun 2017 19:03:52 +0200
changeset 363682 855928e7af3a0b652941edda93fc3e9660c14b5f
parent 363681 aa7a23344ca47d4e66e8cdb4a60ea5b9ad773338
child 363683 4292808c496342d97f9aaa651114dde58d622923
push id91385
push userarchaeopteryx@coole-files.de
push dateTue, 13 Jun 2017 17:04:09 +0000
treeherdermozilla-inbound@855928e7af3a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs1368145
milestone56.0a1
backs outcbd4339e2ca174a730e8187a9f1c644530098709
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset cbd4339e2ca1 (bug 1368145) for failing browser-chrome test browser_contextmenu_sendpage.js. r=backout
browser/base/content/browser-sync.js
browser/base/content/test/urlbar/browser_page_action_menu.js
browser/locales/en-US/chrome/browser/accounts.properties
--- a/browser/base/content/browser-sync.js
+++ b/browser/base/content/browser-sync.js
@@ -321,22 +321,22 @@ var gSync = {
         fragment.appendChild(targetDevice);
       }
 
       const clients = this.remoteClients;
       for (let client of clients) {
         addTargetDevice(client.id, client.name, client.type);
       }
 
-      // "Send to All Devices" menu item
+      // "All devices" menu item
       if (clients.length > 1) {
         const separator = createDeviceNodeFn();
         separator.classList.add("sync-menuitem");
         fragment.appendChild(separator);
-        const allDevicesLabel = this.fxaStrings.GetStringFromName("sendToAllDevices.menuitem");
+        const allDevicesLabel = this.fxaStrings.GetStringFromName("sendTabToAllDevices.menuitem");
         addTargetDevice("", allDevicesLabel, "");
       }
     }
     devicesPopup.appendChild(fragment);
   },
 
   isSendableURI(aURISpec) {
     if (!aURISpec) {
--- a/browser/base/content/test/urlbar/browser_page_action_menu.js
+++ b/browser/base/content/test/urlbar/browser_page_action_menu.js
@@ -388,17 +388,17 @@ add_task(async function sendToDevice_dev
           label: client.name,
           clientType: client.type,
         },
       });
     }
     expectedItems.push(
       null,
       {
-        label: "Send to All Devices",
+        label: "All Devices",
       }
     );
     checkSendToDeviceItems(expectedItems);
 
     // Done, hide the panel.
     let hiddenPromise = promisePanelHidden();
     gPanel.hidePopup();
     await hiddenPromise;
--- a/browser/locales/en-US/chrome/browser/accounts.properties
+++ b/browser/locales/en-US/chrome/browser/accounts.properties
@@ -30,19 +30,19 @@ syncStartNotification.title = Sync Enabl
 # %S is brandShortName
 syncStartNotification.body2 = %S will begin syncing momentarily.
 
 # LOCALIZATION NOTE (deviceDisconnectedNotification.title, deviceDisconnectedNotification.body)
 # These strings are used in a notification shown after Sync was disconnected remotely.
 deviceDisconnectedNotification.title = Sync disconnected
 deviceDisconnectedNotification.body = This computer has been successfully disconnected from Firefox Sync.
 
-# LOCALIZATION NOTE (sendToAllDevices.menuitem)
-# Displayed in the Send Tab/Page/Link to Device context menu when right clicking a tab, a page or a link.
-sendToAllDevices.menuitem = Send to All Devices
+# LOCALIZATION NOTE (sendTabToAllDevices.menuitem)
+# Displayed in the Send Tabs context menu when right clicking a tab, a page or a link.
+sendTabToAllDevices.menuitem = All Devices
 
 # LOCALIZATION NOTE (tabArrivingNotification.title, tabArrivingNotificationWithDevice.title,
 # tabsArrivingNotification.title, unnamedTabsArrivingNotification2.body,
 # unnamedTabsArrivingNotificationMultiple2.body, unnamedTabsArrivingNotificationNoDevice.body)
 # These strings are used in a notification shown when we're opening tab(s) another device sent us to display.
 
 # LOCALIZATION NOTE (tabArrivingNotification.title, tabArrivingNotificationWithDevice.title)
 # The body for these is the URL of the tab recieved