Bug 1184663 - Remove Sync promotion in password doorhanger. r=markh

browser/base/content/urlbarBindings.xml

@@ -2528,8 +2528,6 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/.
           // otherwise just rely on the panel id for common arrowpanels.
           let type = this._panel.firstChild.getAttribute("popupid") ||
                      this._panel.id;
-          if (type == "password")
-            return "passwords";
           if (type == "editBookmarkPanel")
             return "bookmarks";
           if (type == "addon-install-complete" || type == "addon-install-restart") {
@@ -2586,17 +2584,6 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
           let viewsLeft = this._viewsLeft;
           if (viewsLeft) {
-            let notification = this._panel.firstElementChild.notification;
-            if (this._notificationType == "passwords" && notification && notification.options &&
-                notification.options.displayURI instanceof Ci.nsIStandardURL) {
-              let fxAOrigin = new URL(Services.prefs.getCharPref("identity.fxaccounts.remote.signup.uri")).origin
-              if (notification.options.displayURI.prePath == fxAOrigin) {
-                // Somewhat gross hack - we don't want to show the sync promo while
-                // the user may be logging into Sync.
-                return;
-              }
-            }
-
             if (Services.prefs.prefHasUserValue("services.sync.username") &&
                this._notificationType != "addons-sync-disabled") {
               // If the user has already setup Sync, don't show the notification.

browser/locales/en-US/chrome/browser/browser.properties

@@ -445,10 +445,6 @@ browser.menu.showCharacterEncoding=false
 # the add bookmark star panel.  %S will be replaced by syncBrandShortName.
 # The final space separates this text from the Learn More link.
 syncPromoNotification.bookmarks.description=You can access your bookmarks on all your devices with %S.\u0020
-# LOCALIZATION NOTE (syncPromoNotification.passwords.label): This appears in
-# the remember password panel.  %S will be replaced by syncBrandShortName.
-# The final space separates this text from the Learn More link.
-syncPromoNotification.passwords.description=You can access your passwords on all your devices with %S.\u0020
 syncPromoNotification.learnMoreLinkText=Learn More
 # LOCALIZATION NOTE (syncPromoNotification.addons.label): This appears in
 # the add-on install complete panel when Sync isn't set.