Bug 1306847 - Expose browser.urlbar.suggest.searchengine pref; r?adw draft
authorManish Goregaokar <manishsmail@gmail.com>
Sat, 01 Oct 2016 21:41:05 +0530
changeset 419888 f8e9e31c5cf2f5c9bf418c11559d695e6ffca46b
parent 419887 23fde64de82fe7d0f5b8067a6a1ba58bc317036a
child 532671 8ca880243f410732a529cffbd33e8860227bd59c
push id31036
push userbmo:manishearth@gmail.com
push dateSat, 01 Oct 2016 16:11:29 +0000
reviewersadw
bugs1306847
milestone52.0a1
Bug 1306847 - Expose browser.urlbar.suggest.searchengine pref; r?adw MozReview-Commit-ID: FQrQZgoQDu5
browser/app/profile/firefox.js
browser/components/preferences/in-content/privacy.xul
browser/locales/en-US/chrome/browser/preferences/privacy.dtd
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -284,16 +284,17 @@ pref("browser.urlbar.match.title", "#");
 pref("browser.urlbar.match.url", "@");
 
 // The default behavior for the urlbar can be configured to use any combination
 // of the match filters with each additional filter adding more results (union).
 pref("browser.urlbar.suggest.history",              true);
 pref("browser.urlbar.suggest.bookmark",             true);
 pref("browser.urlbar.suggest.openpage",             true);
 pref("browser.urlbar.suggest.searches",             false);
+pref("browser.urlbar.suggest.searchengine",         true);
 pref("browser.urlbar.userMadeSearchSuggestionsChoice", false);
 // 4 here means the suggestion notification will be automatically
 // hidden the 4th day, so it will actually be shown on 3 different days.
 pref("browser.urlbar.daysBeforeHidingSuggestionsPrompt", 4);
 pref("browser.urlbar.lastSuggestionsPromptDate", 20160601);
 
 // Limit the number of characters sent to the current search engine to fetch
 // suggestions.
--- a/browser/components/preferences/in-content/privacy.xul
+++ b/browser/components/preferences/in-content/privacy.xul
@@ -39,16 +39,19 @@
               name="browser.urlbar.suggest.bookmark"
               type="bool"/>
   <preference id="browser.urlbar.suggest.history"
               name="browser.urlbar.suggest.history"
               type="bool"/>
   <preference id="browser.urlbar.suggest.openpage"
               name="browser.urlbar.suggest.openpage"
               type="bool"/>
+  <preference id="browser.urlbar.suggest.searchengine"
+              name="browser.urlbar.suggest.searchengine"
+              type="bool"/>
 
   <!-- History -->
   <preference id="places.history.enabled"
               name="places.history.enabled"
               type="bool"/>
   <preference id="browser.formfill.enable"
               name="browser.formfill.enable"
               type="bool"/>
@@ -272,16 +275,19 @@
             accesskey="&locbar.history.accesskey;"
             preference="browser.urlbar.suggest.history"/>
   <checkbox id="bookmarkSuggestion" label="&locbar.bookmarks.label;"
             accesskey="&locbar.bookmarks.accesskey;"
             preference="browser.urlbar.suggest.bookmark"/>
   <checkbox id="openpageSuggestion" label="&locbar.openpage.label;"
             accesskey="&locbar.openpage.accesskey;"
             preference="browser.urlbar.suggest.openpage"/>
+  <checkbox id="searchEngineSuggestion" label="&locbar.searchengine.label;"
+            accesskey="&locbar.searchengine.accesskey;"
+            preference="browser.urlbar.suggest.searchengine"/>
   <label class="text-link" onclick="gotoPref('search')">
     &suggestionSettings.label;
   </label>
 </groupbox>
 
 <!-- Containers -->
 <groupbox id="browserContainersGroup" data-category="panePrivacy" hidden="true">
   <vbox id="browserContainersbox" hidden="true">
--- a/browser/locales/en-US/chrome/browser/preferences/privacy.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/privacy.dtd
@@ -32,16 +32,18 @@
 
 <!ENTITY  locbar.suggest.label          "When using the location bar, suggest:">
 <!ENTITY  locbar.history.label          "History">
 <!ENTITY  locbar.history.accesskey      "H">
 <!ENTITY  locbar.bookmarks.label        "Bookmarks">
 <!ENTITY  locbar.bookmarks.accesskey    "k">
 <!ENTITY  locbar.openpage.label         "Open tabs">
 <!ENTITY  locbar.openpage.accesskey     "O">
+<!ENTITY  locbar.searchengine.label     "Searching with the default search engine">
+<!ENTITY  locbar.searchengine.accesskey "d">
 <!ENTITY  locbar.searches.label         "Related searches from the default search engine">
 <!ENTITY  locbar.searches.accesskey     "d">
 
 <!ENTITY  suggestionSettings.label      "Change preferences for search engine suggestions…">
 <!ENTITY  suggestionSettings.accesskey  "g">
 
 <!ENTITY  acceptCookies.label           "Accept cookies from sites">
 <!ENTITY  acceptCookies.accesskey       "A">