Bug 838864: disable keyword.URL reset prompt while we sort out conflicts with some partner add-ons, r=fryn, a=lsblakk
authorGavin Sharp <gavin@gavinsharp.com>
Thu, 07 Feb 2013 13:14:11 -0800
changeset 127778 ceaba61217505172bfd4e72193806b7bf8aceb03
parent 127777 63f07a9ed826f6837ac5521aeeab5eb0f2bec55b
child 127785 3ed701c01eb27e9f26f149c60a9c2ce684ee29e7
push id1
push usersledru@mozilla.com
push dateThu, 04 Dec 2014 17:57:20 +0000
reviewersfryn, lsblakk
bugs838864
milestone20.0
Bug 838864: disable keyword.URL reset prompt while we sort out conflicts with some partner add-ons, r=fryn, a=lsblakk
browser/modules/KeywordURLResetPrompter.jsm
--- a/browser/modules/KeywordURLResetPrompter.jsm
+++ b/browser/modules/KeywordURLResetPrompter.jsm
@@ -9,16 +9,19 @@ const Cc = Components.classes;
 const Cu = Components.utils;
 
 Cu.import("resource://gre/modules/Services.jsm");
 
 const KEYWORD_PROMPT_REV = 1;
 
 let KeywordURLResetPrompter = {
   get shouldPrompt() {
+    // XXX Disable the feature for now given some issues with partner addons (bug 838864)
+    return false;
+
     let keywordURLUserSet = Services.prefs.prefHasUserValue("keyword.URL");
     let declinedRev;
     try {
       declinedRev = Services.prefs.getIntPref("browser.keywordURLPromptDeclined");
     } catch (ex) {}
 
     return keywordURLUserSet && declinedRev != KEYWORD_PROMPT_REV;
   },