Bug 1233440 - Replace toast in HelperAppDialog.js with Snackbar. r?mcomella draft
authorSebastian Kaspari <s.kaspari@gmail.com>
Thu, 17 Dec 2015 17:33:52 +0100
changeset 316024 bf418b81627561b2e39731b8b1635a4184cfd230
parent 316023 327f0142e1a78bef241999e9679a357e75ff9698
child 316305 6532f8b042c09e22bdec681284b151e300c7fea9
child 316306 d91ed719bae35d3ce052ecc8fbd31fdf05069752
push id8496
push users.kaspari@gmail.com
push dateThu, 17 Dec 2015 16:34:35 +0000
reviewersmcomella
bugs1233440
milestone46.0a1
Bug 1233440 - Replace toast in HelperAppDialog.js with Snackbar. r?mcomella
mobile/android/components/HelperAppDialog.js
--- a/mobile/android/components/HelperAppDialog.js
+++ b/mobile/android/components/HelperAppDialog.js
@@ -18,16 +18,18 @@ Cu.import("resource://gre/modules/Helper
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/Task.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 
 // -----------------------------------------------------------------------
 // HelperApp Launcher Dialog
 // -----------------------------------------------------------------------
 
+XPCOMUtils.defineLazyModuleGetter(this, "Snackbars", "resource://gre/modules/Snackbars.jsm");
+
 XPCOMUtils.defineLazyGetter(this, "ContentAreaUtils", function() {
   let ContentAreaUtils = {};
   Services.scriptloader.loadSubScript("chrome://global/content/contentAreaUtils.js", ContentAreaUtils);
   return ContentAreaUtils;
 });
 
 function HelperAppLauncherDialog() { }
 
@@ -192,27 +194,21 @@ HelperAppLauncherDialog.prototype = {
         this._setPreferredApp(aLauncher, apps[data.icongrid0]);
       }
     });
   },
 
   _refuseDownload: function(aLauncher) {
     aLauncher.cancel(Cr.NS_BINDING_ABORTED);
 
-    let win = this.getNativeWindow();
-    if (!win) {
-      // Oops.
-      Services.console.logStringMessage("Refusing download, but can't show a toast.");
-      return;
-    }
+    Services.console.logStringMessage("Refusing download of non-downloadable file.");
 
-    Services.console.logStringMessage("Refusing download of non-downloadable file.");
     let bundle = Services.strings.createBundle("chrome://browser/locale/handling.properties");
-    let failedText = bundle.GetStringFromName("download.blocked");
-    win.toast.show(failedText, "long");
+
+    Snackbars.show(bundle.GetStringFromName("download.blocked"), Snackbars.LENGTH_LONG);
   },
 
   _getPrefName: function getPrefName(mimetype) {
     return "browser.download.preferred." + mimetype.replace("\\", ".");
   },
 
   _getMimeTypeFromLauncher: function (launcher) {
     let mime = launcher.MIMEInfo.MIMEType;