From 25370b7f0cc8709821acc8b7826c2c6e38268c67 Mon Sep 17 00:00:00 2001
From: JustOff <Off.Just.Off@gmail.com>
Date: Sat, 14 Apr 2018 13:00:36 +0300
Subject: Remove dead Places protocol handler in Pale Moon

---
 .../components/places/BrowserPlaces.manifest       |  2 -
 .../components/places/PlacesProtocolHandler.js     | 49 ----------------------
 application/palemoon/components/places/moz.build   |  4 --
 application/palemoon/installer/package-manifest.in |  2 -
 4 files changed, 57 deletions(-)
 delete mode 100644 application/palemoon/components/places/BrowserPlaces.manifest
 delete mode 100644 application/palemoon/components/places/PlacesProtocolHandler.js

(limited to 'application/palemoon')

diff --git a/application/palemoon/components/places/BrowserPlaces.manifest b/application/palemoon/components/places/BrowserPlaces.manifest
deleted file mode 100644
index 3b25f50f4..000000000
--- a/application/palemoon/components/places/BrowserPlaces.manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-component {6bcb9bde-9018-4443-a071-c32653469597} PlacesProtocolHandler.js
-contract @mozilla.org/network/protocol;1?name=place {6bcb9bde-9018-4443-a071-c32653469597}
diff --git a/application/palemoon/components/places/PlacesProtocolHandler.js b/application/palemoon/components/places/PlacesProtocolHandler.js
deleted file mode 100644
index ebffd2e28..000000000
--- a/application/palemoon/components/places/PlacesProtocolHandler.js
+++ /dev/null
@@ -1,49 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: sw=2 ts=2 sts=2 et
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-const Cc = Components.classes;
-const Ci = Components.interfaces;
-
-Components.utils.import("resource://gre/modules/NetUtil.jsm");
-Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
-
-const SCHEME = "place";
-const URL = "chrome://browser/content/places/content-ui/controller.xhtml";
-
-function PlacesProtocolHandler() {}
-
-PlacesProtocolHandler.prototype = {
-  scheme: SCHEME,
-  defaultPort: -1,
-  protocolFlags: Ci.nsIProtocolHandler.URI_DANGEROUS_TO_LOAD |
-                 Ci.nsIProtocolHandler.URI_IS_LOCAL_RESOURCE |
-                 Ci.nsIProtocolHandler.URI_NORELATIVE |
-                 Ci.nsIProtocolHandler.URI_NOAUTH,
-
-  newURI: function PPH_newURI(aSpec, aOriginCharset, aBaseUri) {
-    let uri = Cc["@mozilla.org/network/simple-uri;1"].createInstance(Ci.nsIURI);
-    uri.spec = aSpec;
-    return uri;
-  },
-
-  newChannel: function PPH_newChannel(aUri) {
-    let chan = NetUtil.newChannel(URL);
-    chan.originalURI = aUri;
-    return chan;
-  },
-
-  allowPort: function PPH_allowPort(aPort, aScheme) {
-    return false;
-  },
-
-  QueryInterface: XPCOMUtils.generateQI([
-    Ci.nsIProtocolHandler
-  ]),
-
-  classID: Components.ID("{6bcb9bde-9018-4443-a071-c32653469597}")
-};
-
-this.NSGetFactory = XPCOMUtils.generateNSGetFactory([PlacesProtocolHandler]);
diff --git a/application/palemoon/components/places/moz.build b/application/palemoon/components/places/moz.build
index fc69beed9..2e35e1951 100644
--- a/application/palemoon/components/places/moz.build
+++ b/application/palemoon/components/places/moz.build
@@ -6,9 +6,5 @@
 
 JAR_MANIFESTS += ['jar.mn']
 
-EXTRA_COMPONENTS += [
-    'BrowserPlaces.manifest',
-    'PlacesProtocolHandler.js',
-]
 EXTRA_JS_MODULES += [ 'PlacesUIUtils.jsm' ]
 
diff --git a/application/palemoon/installer/package-manifest.in b/application/palemoon/installer/package-manifest.in
index ffe033596..aefa7fdd7 100644
--- a/application/palemoon/installer/package-manifest.in
+++ b/application/palemoon/installer/package-manifest.in
@@ -400,7 +400,6 @@
 @RESPATH@/browser/components/BrowserDownloads.manifest
 @RESPATH@/browser/components/DownloadsStartup.js
 @RESPATH@/browser/components/DownloadsUI.js
-@RESPATH@/browser/components/BrowserPlaces.manifest
 @RESPATH@/components/Downloads.manifest
 @RESPATH@/components/DownloadLegacy.js
 @RESPATH@/components/BrowserPageThumbs.manifest
@@ -471,7 +470,6 @@
 @RESPATH@/components/UnifiedComplete.manifest
 @RESPATH@/components/UnifiedComplete.js
 @RESPATH@/components/nsPlacesExpiration.js
-@RESPATH@/browser/components/PlacesProtocolHandler.js
 @RESPATH@/components/PlacesCategoriesStarter.js
 @RESPATH@/components/ColorAnalyzer.js
 @RESPATH@/components/PageThumbsProtocol.js
-- 
cgit v1.2.3


From b519af540873c09e468687b8e95627f81f23b4d5 Mon Sep 17 00:00:00 2001
From: janekptacijarabaci <janekptacijarabaci@seznam.cz>
Date: Sun, 15 Apr 2018 08:13:22 +0200
Subject: [PALEMOON] Fix a warning: "unreachable code after return statement"
 in urlbarBindings.xml

Issue #121
---
 application/palemoon/base/content/urlbarBindings.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'application/palemoon')

diff --git a/application/palemoon/base/content/urlbarBindings.xml b/application/palemoon/base/content/urlbarBindings.xml
index c99819f0d..ce7de3665 100644
--- a/application/palemoon/base/content/urlbarBindings.xml
+++ b/application/palemoon/base/content/urlbarBindings.xml
@@ -1913,7 +1913,7 @@
             viewsLeft = 0;
             return;
             // XXX
-            
+            /*
             if (Services.prefs.prefHasUserValue("services.sync.username") &&
                this._notificationType != "addons-sync-disabled") {
               // If the user has already setup Sync, don't show the notification.
@@ -1947,6 +1947,7 @@
               this._promomessage.firstChild.textContent = this._notificationMessage;
               this._promomessage.height = this._promomessage.getBoundingClientRect().height;
             }.bind(this), true);
+            */
           }
         ]]></body>
       </method>
-- 
cgit v1.2.3


From f8086ef486f296515958d2254873b902fdab3db1 Mon Sep 17 00:00:00 2001
From: janekptacijarabaci <janekptacijarabaci@seznam.cz>
Date: Sun, 15 Apr 2018 17:55:14 +0200
Subject: [PALEMOON] [Frontend vs Backend] HTML - input - datetime

Issue #162
---
 application/palemoon/base/content/browser.css      |  8 ++++++--
 application/palemoon/base/content/browser.xul      | 17 ++++++++++++++-
 application/palemoon/base/content/tabbrowser.xml   | 24 +++++++++++++---------
 application/palemoon/components/nsBrowserGlue.js   |  4 ++++
 .../palemoon/modules/FormValidationHandler.jsm     |  2 +-
 5 files changed, 41 insertions(+), 14 deletions(-)

(limited to 'application/palemoon')

diff --git a/application/palemoon/base/content/browser.css b/application/palemoon/base/content/browser.css
index e6a84421b..24cbb9d8e 100644
--- a/application/palemoon/base/content/browser.css
+++ b/application/palemoon/base/content/browser.css
@@ -280,6 +280,10 @@ panel[noactions] > richlistbox > richlistitem[type~="action"] > .ac-url-box > .a
   -moz-binding: url("chrome://browser/content/urlbarBindings.xml#urlbar-rich-result-popup");
 }
 
+#DateTimePickerPanel[active="true"] {
+  -moz-binding: url("chrome://global/content/bindings/datetimepopup.xml#datetime-popup");
+}
+
 /* Pale Moon: Address bar: Feeds */
 #ub-feed-button > .button-box > .box-inherit > .button-text,
 #ub-feed-button > .button-box > .button-menu-dropmarker {
@@ -542,11 +546,11 @@ window[chromehidden~="toolbar"] toolbar:not(.toolbar-primary):not(#nav-bar):not(
   max-width: 280px;
 }
 
-.form-validation-anchor {
+.popup-anchor {
   /* should occupy space but not be visible */
   opacity: 0;
-  visibility: hidden;
   pointer-events: none;
+  -moz-stack-sizing: ignore;
 }
 
 #addon-progress-notification {
diff --git a/application/palemoon/base/content/browser.xul b/application/palemoon/base/content/browser.xul
index df152bbaa..8a79890cd 100644
--- a/application/palemoon/base/content/browser.xul
+++ b/application/palemoon/base/content/browser.xul
@@ -132,6 +132,20 @@
     <!-- for url bar autocomplete -->
     <panel type="autocomplete-richlistbox" id="PopupAutoCompleteRichResult" noautofocus="true" hidden="true"/>
 
+    <!-- for date/time picker. consumeoutsideclicks is set to never, so that
+         clicks on the anchored input box are never consumed. -->
+    <panel id="DateTimePickerPanel"
+           type="arrow"
+           hidden="true"
+           orient="vertical"
+           noautofocus="true"
+           norolluponanchor="true"
+           consumeoutsideclicks="never"
+           level="parent"
+           tabspecific="true">
+      <iframe id="dateTimePopupFrame"/>
+    </panel>
+
     <!-- for invalid form error message -->
     <panel id="invalid-form-popup" type="arrow" orient="vertical" noautofocus="true" hidden="true" level="parent">
       <description/>
@@ -946,7 +960,8 @@
                   flex="1" contenttooltip="aHTMLTooltip"
                   tabcontainer="tabbrowser-tabs"
                   contentcontextmenu="contentAreaContextMenu"
-                  autocompletepopup="PopupAutoComplete"/>
+                  autocompletepopup="PopupAutoComplete"
+                  datetimepicker="DateTimePickerPanel"/>
       <chatbar id="pinnedchats" layer="true" mousethrough="always" hidden="true"/>
       <statuspanel id="statusbar-display" inactive="true"/>
     </vbox>
diff --git a/application/palemoon/base/content/tabbrowser.xml b/application/palemoon/base/content/tabbrowser.xml
index 4b10855a7..eaf3ea4d9 100644
--- a/application/palemoon/base/content/tabbrowser.xml
+++ b/application/palemoon/base/content/tabbrowser.xml
@@ -30,7 +30,7 @@
               <xul:vbox flex="1" class="browserContainer">
                 <xul:stack flex="1" class="browserStack" anonid="browserStack">
                   <xul:browser anonid="initialBrowser" type="content-primary" message="true" disablehistory="true"
-                               xbl:inherits="tooltip=contenttooltip,contextmenu=contentcontextmenu,autocompletepopup"/>
+                               xbl:inherits="tooltip=contenttooltip,contextmenu=contentcontextmenu,autocompletepopup,datetimepicker"/>
                 </xul:stack>
               </xul:vbox>
             </xul:hbox>
@@ -138,19 +138,19 @@
         ]]></getter>
       </property>
 
-      <property name="formValidationAnchor" readonly="true">
+      <property name="popupAnchor" readonly="true">
         <getter><![CDATA[
-        if (this.mCurrentTab._formValidationAnchor) {
-          return this.mCurrentTab._formValidationAnchor;
+        if (this.mCurrentTab._popupAnchor) {
+          return this.mCurrentTab._popupAnchor;
         }
         let stack = this.mCurrentBrowser.parentNode;
-        // Create an anchor for the form validation popup
+        // Create an anchor for the popup
         const NS_XUL = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
-        let formValidationAnchor = document.createElementNS(NS_XUL, "hbox");
-        formValidationAnchor.className = "form-validation-anchor";
-        formValidationAnchor.hidden = true;
-        stack.appendChild(formValidationAnchor);
-        return this.mCurrentTab._formValidationAnchor = formValidationAnchor;
+        let popupAnchor = document.createElementNS(NS_XUL, "hbox");
+        popupAnchor.className = "popup-anchor";
+        popupAnchor.hidden = true;
+        stack.appendChild(popupAnchor);
+        return this.mCurrentTab._popupAnchor = popupAnchor;
         ]]></getter>
       </property>
 
@@ -1451,6 +1451,10 @@
               b.setAttribute("autocompletepopup", this.getAttribute("autocompletepopup"));
             b.setAttribute("autoscrollpopup", this._autoScrollPopup.id);
 
+            if (this.hasAttribute("datetimepicker")) {
+              b.setAttribute("datetimepicker", this.getAttribute("datetimepicker"));
+            }
+
             // Create the browserStack container
             var stack = document.createElementNS(NS_XUL, "stack");
             stack.className = "browserStack";
diff --git a/application/palemoon/components/nsBrowserGlue.js b/application/palemoon/components/nsBrowserGlue.js
index cdb0b7522..c4205c2c5 100644
--- a/application/palemoon/components/nsBrowserGlue.js
+++ b/application/palemoon/components/nsBrowserGlue.js
@@ -35,6 +35,7 @@ Cu.import("resource://gre/modules/Services.jsm");
   ["OS", "resource://gre/modules/osfile.jsm"],
   ["LoginManagerParent", "resource://gre/modules/LoginManagerParent.jsm"],
   ["FormValidationHandler", "resource:///modules/FormValidationHandler.jsm"],
+  ["DateTimePickerHelper", "resource://gre/modules/DateTimePickerHelper.jsm"],
 ].forEach(([name, resource]) => XPCOMUtils.defineLazyModuleGetter(this, name, resource));
 
 const PREF_PLUGINS_NOTIFYUSER = "plugins.update.notifyUser";
@@ -167,6 +168,7 @@ BrowserGlue.prototype = {
         } catch (e) {
           Cu.reportError("Could not end startup crash tracking in quit-application-granted: " + e);
         }
+        DateTimePickerHelper.uninit();
         break;
 #ifdef OBSERVE_LASTWINDOW_CLOSE_TOPICS
       case "browser-lastwindow-close-requested":
@@ -496,6 +498,8 @@ BrowserGlue.prototype = {
     }
 #endif
 
+    DateTimePickerHelper.init();
+
     this._trackSlowStartup();
   },
 
diff --git a/application/palemoon/modules/FormValidationHandler.jsm b/application/palemoon/modules/FormValidationHandler.jsm
index 05be510e1..d01d4d3b9 100644
--- a/application/palemoon/modules/FormValidationHandler.jsm
+++ b/application/palemoon/modules/FormValidationHandler.jsm
@@ -122,7 +122,7 @@ let FormValidationHandler =
     this._panel.hidden = false;
 
     let tabBrowser = aWindow.gBrowser;
-    this._anchor = tabBrowser.formValidationAnchor;
+    this._anchor = tabBrowser.popupAnchor;
     this._anchor.left = aPanelData.contentRect.left;
     this._anchor.top = aPanelData.contentRect.top;
     this._anchor.width = aPanelData.contentRect.width;
-- 
cgit v1.2.3


From 4cc139ccb85e1119be54ab0a620476208df9cc29 Mon Sep 17 00:00:00 2001
From: "Matt A. Tobin" <email@mattatobin.com>
Date: Sun, 15 Apr 2018 16:21:35 -0400
Subject: [PALEMOON] Fix packaging define

---
 application/palemoon/installer/Makefile.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'application/palemoon')

diff --git a/application/palemoon/installer/Makefile.in b/application/palemoon/installer/Makefile.in
index 7cd77bdca..0a0935255 100644
--- a/application/palemoon/installer/Makefile.in
+++ b/application/palemoon/installer/Makefile.in
@@ -34,9 +34,9 @@ ifdef MOZ_ENABLE_GNOME_COMPONENT
 DEFINES += -DMOZ_ENABLE_GNOME_COMPONENT=1
 endif
 
-ifdef MOZ_WIDGET_GTK
+ifneq (,$(filter gtk%,$(MOZ_WIDGET_TOOLKIT)))
 DEFINES += -DMOZ_GTK=1
-ifdef MOZ_ENABLE_GTK3
+ifeq ($(MOZ_WIDGET_TOOLKIT),gtk3)
 DEFINES += -DMOZ_GTK3=1
 endif
 endif
-- 
cgit v1.2.3


From 7ae62c29818d9562d376315c65cf9f55266728c3 Mon Sep 17 00:00:00 2001
From: "Matt A. Tobin" <email@mattatobin.com>
Date: Sun, 15 Apr 2018 18:21:23 -0400
Subject: [PALEMOON] Fix packaging define for ICU

---
 application/palemoon/installer/Makefile.in | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'application/palemoon')

diff --git a/application/palemoon/installer/Makefile.in b/application/palemoon/installer/Makefile.in
index 0a0935255..368b16efc 100644
--- a/application/palemoon/installer/Makefile.in
+++ b/application/palemoon/installer/Makefile.in
@@ -131,16 +131,17 @@ AB = $(firstword $(subst -, ,$(AB_CD)))
 DEFINES += -DAB=$(AB)
 
 DEFINES += -DMOZ_ICU_VERSION=$(MOZ_ICU_VERSION)
-ifdef MOZ_NATIVE_ICU
-DEFINES += -DMOZ_NATIVE_ICU
+ifdef MOZ_SYSTEM_ICU
+DEFINES += -DMOZ_SYSTEM_ICU
 endif
-ifdef MOZ_SHARED_ICU
-DEFINES += -DMOZ_SHARED_ICU
+ifdef MOZ_ICU_DATA_ARCHIVE
+DEFINES += -DMOZ_ICU_DATA_ARCHIVE
 endif
 ifdef MOZ_JEMALLOC3
 DEFINES += -DMOZ_JEMALLOC3
 endif
 DEFINES += -DMOZ_ICU_DBG_SUFFIX=$(MOZ_ICU_DBG_SUFFIX)
+DEFINES += -DICU_DATA_FILE=$(ICU_DATA_FILE)
 ifdef CLANG_CXX
 DEFINES += -DCLANG_CXX
 endif
-- 
cgit v1.2.3


From 931950a880b3550490422b1855c509be10586858 Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@gmail.com>
Date: Mon, 16 Apr 2018 14:47:03 +0200
Subject: Mass-replace global-scope let with var in Pale Moon and TychoAM

tag #155
---
 application/palemoon/base/content/abouthome/aboutHome.js |  4 ++--
 application/palemoon/base/content/browser-addons.js      |  4 ++--
 .../palemoon/base/content/browser-gestureSupport.js      |  4 ++--
 application/palemoon/base/content/browser-places.js      |  4 ++--
 application/palemoon/base/content/browser-syncui.js      |  2 +-
 application/palemoon/base/content/browser-thumbnails.js  |  2 +-
 application/palemoon/base/content/browser-webrtcUI.js    |  2 +-
 application/palemoon/base/content/browser.js             |  7 ++++---
 application/palemoon/base/content/newtab/drag.js         |  2 +-
 .../palemoon/base/content/newtab/dragDataHelper.js       |  2 +-
 application/palemoon/base/content/newtab/drop.js         |  2 +-
 application/palemoon/base/content/newtab/dropPreview.js  |  2 +-
 .../palemoon/base/content/newtab/dropTargetShim.js       |  2 +-
 application/palemoon/base/content/newtab/grid.js         |  2 +-
 application/palemoon/base/content/newtab/newTab.js       |  2 +-
 application/palemoon/base/content/newtab/page.js         |  2 +-
 .../palemoon/base/content/newtab/transformations.js      |  2 +-
 application/palemoon/base/content/newtab/undo.js         |  2 +-
 application/palemoon/base/content/newtab/updater.js      |  2 +-
 application/palemoon/base/content/openLocation.js        |  4 ++--
 application/palemoon/base/content/sync/aboutSyncTabs.js  |  2 +-
 application/palemoon/base/content/sync/addDevice.js      |  2 +-
 application/palemoon/base/content/sync/genericChange.js  |  2 +-
 application/palemoon/base/content/sync/progress.js       |  4 ++--
 application/palemoon/base/content/sync/quota.js          |  4 ++--
 application/palemoon/base/content/sync/utils.js          |  2 +-
 .../palemoon/components/downloads/DownloadsCommon.jsm    |  2 +-
 .../downloads/content/contentAreaDownloadsView.js        |  2 +-
 .../palemoon/components/places/content/controller.js     |  2 +-
 application/palemoon/components/places/content/places.js |  4 ++--
 .../palemoon/components/preferences/aboutPermissions.js  | 14 +++++++-------
 application/palemoon/components/preferences/sanitize.js  |  2 +-
 application/palemoon/components/preferences/sync.js      |  2 +-
 .../palemoon/components/sessionstore/SessionStorage.jsm  |  4 ++--
 .../palemoon/components/sessionstore/SessionStore.jsm    | 12 ++++++------
 .../palemoon/components/sessionstore/_SessionFile.jsm    |  2 +-
 .../palemoon/components/sessionstore/nsSessionStartup.js |  2 +-
 application/palemoon/components/shell/ShellService.jsm   |  2 +-
 application/palemoon/modules/BrowserNewTabPreloader.jsm  |  8 ++++----
 application/palemoon/modules/FormSubmitObserver.jsm      | 16 ++++++++--------
 application/palemoon/modules/FormValidationHandler.jsm   |  8 ++++----
 application/palemoon/modules/NetworkPrioritizer.jsm      |  8 ++++----
 application/palemoon/modules/PopupNotifications.jsm      |  4 ++--
 application/palemoon/modules/SharedFrame.jsm             |  2 +-
 application/palemoon/modules/openLocationLastURL.jsm     |  8 ++++----
 application/palemoon/modules/promise.js                  |  2 +-
 46 files changed, 89 insertions(+), 88 deletions(-)

(limited to 'application/palemoon')

diff --git a/application/palemoon/base/content/abouthome/aboutHome.js b/application/palemoon/base/content/abouthome/aboutHome.js
index 9e826b69e..6a970acd6 100644
--- a/application/palemoon/base/content/abouthome/aboutHome.js
+++ b/application/palemoon/base/content/abouthome/aboutHome.js
@@ -234,8 +234,8 @@ const SEARCH_ENGINES = {
 };
 
 // This global tracks if the page has been set up before, to prevent double inits
-let gInitialized = false;
-let gObserver = new MutationObserver(function (mutations) {
+var gInitialized = false;
+var gObserver = new MutationObserver(function (mutations) {
   for (let mutation of mutations) {
     if (mutation.attributeName == "searchEngineURL") {
       setupSearchEngine();
diff --git a/application/palemoon/base/content/browser-addons.js b/application/palemoon/base/content/browser-addons.js
index 7993a0c9c..f5c398f33 100644
--- a/application/palemoon/base/content/browser-addons.js
+++ b/application/palemoon/base/content/browser-addons.js
@@ -226,7 +226,7 @@ const gXPInstallObserver = {
  * - If an add-on was installed, incrementing the count, show the bar.
  * - If an add-on was uninstalled, and no more items are left, hide the bar.
  */
-let AddonsMgrListener = {
+var AddonsMgrListener = {
   get addonBar() document.getElementById("addon-bar"),
   get statusBar() document.getElementById("status-bar"),
   getAddonBarItemCount: function() {
@@ -461,7 +461,7 @@ var LightWeightThemeWebInstaller = {
 /*
  * Listen for Lightweight Theme styling changes and update the browser's theme accordingly.
  */
-let LightweightThemeListener = {
+var LightweightThemeListener = {
   _modifiedStyles: [],
 
   init: function () {
diff --git a/application/palemoon/base/content/browser-gestureSupport.js b/application/palemoon/base/content/browser-gestureSupport.js
index d88f47c79..13eb71b99 100644
--- a/application/palemoon/base/content/browser-gestureSupport.js
+++ b/application/palemoon/base/content/browser-gestureSupport.js
@@ -13,7 +13,7 @@
 // chrome-only, we must listen for the simple gesture events during
 // the capturing phase and call stopPropagation on every event.
 
-let gGestureSupport = {
+var gGestureSupport = {
   _currentRotation: 0,
   _lastRotateDelta: 0,
   _rotateMomentumThreshold: .75,
@@ -532,7 +532,7 @@ let gGestureSupport = {
 };
 
 // History Swipe Animation Support (bug 678392)
-let gHistorySwipeAnimation = {
+var gHistorySwipeAnimation = {
 
   active: false,
   isLTR: false,
diff --git a/application/palemoon/base/content/browser-places.js b/application/palemoon/base/content/browser-places.js
index cf9c28597..5c13a43f9 100644
--- a/application/palemoon/base/content/browser-places.js
+++ b/application/palemoon/base/content/browser-places.js
@@ -959,7 +959,7 @@ var PlacesMenuDNDHandler = {
  * This object handles the initialization and uninitialization of the bookmarks
  * toolbar.
  */
-let PlacesToolbarHelper = {
+var PlacesToolbarHelper = {
   _place: "place:folder=TOOLBAR",
 
   get _viewElt() {
@@ -1006,7 +1006,7 @@ let PlacesToolbarHelper = {
  * menu button.
  */
 
-let BookmarkingUI = {
+var BookmarkingUI = {
   get button() {
     if (!this._button) {
       this._button = document.getElementById("bookmarks-menu-button");
diff --git a/application/palemoon/base/content/browser-syncui.js b/application/palemoon/base/content/browser-syncui.js
index fc8c7f016..67056e221 100644
--- a/application/palemoon/base/content/browser-syncui.js
+++ b/application/palemoon/base/content/browser-syncui.js
@@ -3,7 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 // gSyncUI handles updating the tools menu
-let gSyncUI = {
+var gSyncUI = {
   _obs: ["weave:service:sync:start",
          "weave:service:sync:delayed",
          "weave:service:quota:remaining",
diff --git a/application/palemoon/base/content/browser-thumbnails.js b/application/palemoon/base/content/browser-thumbnails.js
index b06dfd503..079b0ac1b 100644
--- a/application/palemoon/base/content/browser-thumbnails.js
+++ b/application/palemoon/base/content/browser-thumbnails.js
@@ -7,7 +7,7 @@
 /**
  * Keeps thumbnails of open web pages up-to-date.
  */
-let gBrowserThumbnails = {
+var gBrowserThumbnails = {
   /**
    * Pref that controls whether we can store SSL content on disk
    */
diff --git a/application/palemoon/base/content/browser-webrtcUI.js b/application/palemoon/base/content/browser-webrtcUI.js
index a6c9008ca..d59134ce5 100644
--- a/application/palemoon/base/content/browser-webrtcUI.js
+++ b/application/palemoon/base/content/browser-webrtcUI.js
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-let WebrtcIndicator = {
+var WebrtcIndicator = {
   init: function () {
     let temp = {};
     Cu.import("resource:///modules/webrtcUI.jsm", temp);
diff --git a/application/palemoon/base/content/browser.js b/application/palemoon/base/content/browser.js
index b2d260101..fc2e63393 100644
--- a/application/palemoon/base/content/browser.js
+++ b/application/palemoon/base/content/browser.js
@@ -2329,7 +2329,7 @@ function BrowserOnAboutPageLoad(doc) {
 /**
  * Handle command events bubbling up from error page content
  */
-let BrowserOnClick = {
+var BrowserOnClick = {
   handleEvent: function BrowserOnClick_handleEvent(aEvent) {
     if (!aEvent.isTrusted || // Don't trust synthetic events
         aEvent.button == 2 || aEvent.target.localName != "button") {
@@ -6998,7 +6998,8 @@ function focusNextFrame(event) {
   if (element.ownerDocument == document)
     focusAndSelectUrlBar();
 }
-let BrowserChromeTest = {
+
+var BrowserChromeTest = {
   _cb: null,
   _ready: false,
   markAsReady: function () {
@@ -7016,7 +7017,7 @@ let BrowserChromeTest = {
   }
 };
 
-let ToolbarIconColor = {
+var ToolbarIconColor = {
   init: function () {
     this._initialized = true;
 
diff --git a/application/palemoon/base/content/newtab/drag.js b/application/palemoon/base/content/newtab/drag.js
index 8f0bf674e..fbd688faa 100644
--- a/application/palemoon/base/content/newtab/drag.js
+++ b/application/palemoon/base/content/newtab/drag.js
@@ -7,7 +7,7 @@
 /**
  * This singleton implements site dragging functionality.
  */
-let gDrag = {
+var gDrag = {
   /**
    * The site offset to the drag start point.
    */
diff --git a/application/palemoon/base/content/newtab/dragDataHelper.js b/application/palemoon/base/content/newtab/dragDataHelper.js
index a66e4e87e..54348ab14 100644
--- a/application/palemoon/base/content/newtab/dragDataHelper.js
+++ b/application/palemoon/base/content/newtab/dragDataHelper.js
@@ -4,7 +4,7 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 #endif
 
-let gDragDataHelper = {
+var gDragDataHelper = {
   get mimeType() {
     return "text/x-moz-url";
   },
diff --git a/application/palemoon/base/content/newtab/drop.js b/application/palemoon/base/content/newtab/drop.js
index d7bf30506..748652455 100644
--- a/application/palemoon/base/content/newtab/drop.js
+++ b/application/palemoon/base/content/newtab/drop.js
@@ -11,7 +11,7 @@ const DELAY_REARRANGE_MS = 100;
 /**
  * This singleton implements site dropping functionality.
  */
-let gDrop = {
+var gDrop = {
   /**
    * The last drop target.
    */
diff --git a/application/palemoon/base/content/newtab/dropPreview.js b/application/palemoon/base/content/newtab/dropPreview.js
index 903762345..fd7587a35 100644
--- a/application/palemoon/base/content/newtab/dropPreview.js
+++ b/application/palemoon/base/content/newtab/dropPreview.js
@@ -9,7 +9,7 @@
  * indicate the transformation that results from dropping a cell at a certain
  * position.
  */
-let gDropPreview = {
+var gDropPreview = {
   /**
    * Rearranges the sites currently contained in the grid when a site would be
    * dropped onto the given cell.
diff --git a/application/palemoon/base/content/newtab/dropTargetShim.js b/application/palemoon/base/content/newtab/dropTargetShim.js
index a85a6ccd6..046dbea1e 100644
--- a/application/palemoon/base/content/newtab/dropTargetShim.js
+++ b/application/palemoon/base/content/newtab/dropTargetShim.js
@@ -9,7 +9,7 @@
  * the default DnD target detection relies on the cursor's position. We want
  * to pick a drop target based on the dragged site's position.
  */
-let gDropTargetShim = {
+var gDropTargetShim = {
   /**
    * Cache for the position of all cells, cleaned after drag finished.
    */
diff --git a/application/palemoon/base/content/newtab/grid.js b/application/palemoon/base/content/newtab/grid.js
index 3b7dfc35f..46e0b804b 100644
--- a/application/palemoon/base/content/newtab/grid.js
+++ b/application/palemoon/base/content/newtab/grid.js
@@ -7,7 +7,7 @@
 /**
  * This singleton represents the grid that contains all sites.
  */
-let gGrid = {
+var gGrid = {
   /**
    * The DOM node of the grid.
    */
diff --git a/application/palemoon/base/content/newtab/newTab.js b/application/palemoon/base/content/newtab/newTab.js
index 6d8647ab6..bba73fd7a 100644
--- a/application/palemoon/base/content/newtab/newTab.js
+++ b/application/palemoon/base/content/newtab/newTab.js
@@ -18,7 +18,7 @@ XPCOMUtils.defineLazyModuleGetter(this, "Rect",
 XPCOMUtils.defineLazyModuleGetter(this, "PrivateBrowsingUtils",
   "resource://gre/modules/PrivateBrowsingUtils.jsm");
 
-let {
+var {
   links: gLinks,
   allPages: gAllPages,
   linkChecker: gLinkChecker,
diff --git a/application/palemoon/base/content/newtab/page.js b/application/palemoon/base/content/newtab/page.js
index afe5bfba8..fc836a55e 100644
--- a/application/palemoon/base/content/newtab/page.js
+++ b/application/palemoon/base/content/newtab/page.js
@@ -8,7 +8,7 @@
  * This singleton represents the whole 'New Tab Page' and takes care of
  * initializing all its components.
  */
-let gPage = {
+var gPage = {
   /**
    * Initializes the page.
    */
diff --git a/application/palemoon/base/content/newtab/transformations.js b/application/palemoon/base/content/newtab/transformations.js
index 6d1554f5f..0711d7d0a 100644
--- a/application/palemoon/base/content/newtab/transformations.js
+++ b/application/palemoon/base/content/newtab/transformations.js
@@ -9,7 +9,7 @@
  * in the DOM and by showing or hiding the node. It additionally provides
  * convenience methods to work with a site's DOM node.
  */
-let gTransformation = {
+var gTransformation = {
   /**
    * Returns the width of the left and top border of a cell. We need to take it
    * into account when measuring and comparing site and cell positions.
diff --git a/application/palemoon/base/content/newtab/undo.js b/application/palemoon/base/content/newtab/undo.js
index 5f619e980..b856914d2 100644
--- a/application/palemoon/base/content/newtab/undo.js
+++ b/application/palemoon/base/content/newtab/undo.js
@@ -8,7 +8,7 @@
  * Dialog allowing to undo the removal of single site or to completely restore
  * the grid's original state.
  */
-let gUndoDialog = {
+var gUndoDialog = {
   /**
    * The undo dialog's timeout in miliseconds.
    */
diff --git a/application/palemoon/base/content/newtab/updater.js b/application/palemoon/base/content/newtab/updater.js
index 7b483e037..e6da37f87 100644
--- a/application/palemoon/base/content/newtab/updater.js
+++ b/application/palemoon/base/content/newtab/updater.js
@@ -8,7 +8,7 @@
  * This singleton provides functionality to update the current grid to a new
  * set of pinned and blocked sites. It adds, moves and removes sites.
  */
-let gUpdater = {
+var gUpdater = {
   /**
    * Updates the current grid according to its pinned and blocked sites.
    * This removes old, moves existing and creates new sites to fill gaps.
diff --git a/application/palemoon/base/content/openLocation.js b/application/palemoon/base/content/openLocation.js
index 5b731c7e8..316dfac70 100644
--- a/application/palemoon/base/content/openLocation.js
+++ b/application/palemoon/base/content/openLocation.js
@@ -7,7 +7,7 @@
 var browser;
 var dialog = {};
 var pref = null;
-let openLocationModule = {};
+var openLocationModule = {};
 try {
   pref = Components.classes["@mozilla.org/preferences-service;1"]
                    .getService(Components.interfaces.nsIPrefBranch);
@@ -16,7 +16,7 @@ try {
 }
 
 Components.utils.import("resource:///modules/openLocationLastURL.jsm", openLocationModule);
-let gOpenLocationLastURL = new openLocationModule.OpenLocationLastURL(window.opener);
+var gOpenLocationLastURL = new openLocationModule.OpenLocationLastURL(window.opener);
 
 function onLoad()
 {
diff --git a/application/palemoon/base/content/sync/aboutSyncTabs.js b/application/palemoon/base/content/sync/aboutSyncTabs.js
index 535c43e56..bc624a459 100644
--- a/application/palemoon/base/content/sync/aboutSyncTabs.js
+++ b/application/palemoon/base/content/sync/aboutSyncTabs.js
@@ -11,7 +11,7 @@ Cu.import("resource://gre/modules/PlacesUtils.jsm", this);
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 
-let RemoteTabViewer = {
+var RemoteTabViewer = {
   _tabsList: null,
 
   init: function () {
diff --git a/application/palemoon/base/content/sync/addDevice.js b/application/palemoon/base/content/sync/addDevice.js
index 556e75768..40862a791 100644
--- a/application/palemoon/base/content/sync/addDevice.js
+++ b/application/palemoon/base/content/sync/addDevice.js
@@ -15,7 +15,7 @@ const ADD_DEVICE_PAGE       = 0;
 const SYNC_KEY_PAGE         = 1;
 const DEVICE_CONNECTED_PAGE = 2;
 
-let gSyncAddDevice = {
+var gSyncAddDevice = {
 
   init: function init() {
     this.pin1.setAttribute("maxlength", PIN_PART_LENGTH);
diff --git a/application/palemoon/base/content/sync/genericChange.js b/application/palemoon/base/content/sync/genericChange.js
index 6d1ce9485..0c6dc145e 100644
--- a/application/palemoon/base/content/sync/genericChange.js
+++ b/application/palemoon/base/content/sync/genericChange.js
@@ -8,7 +8,7 @@ const Cc = Components.classes;
 Components.utils.import("resource://services-sync/main.js");
 Components.utils.import("resource://gre/modules/Services.jsm");
 
-let Change = {
+var Change = {
   _dialog: null,
   _dialogType: null,
   _status: null,
diff --git a/application/palemoon/base/content/sync/progress.js b/application/palemoon/base/content/sync/progress.js
index 2063f612a..101160fa8 100644
--- a/application/palemoon/base/content/sync/progress.js
+++ b/application/palemoon/base/content/sync/progress.js
@@ -6,8 +6,8 @@ const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components;
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://services-sync/main.js");
 
-let gProgressBar;
-let gCounter = 0;
+var gProgressBar;
+var gCounter = 0;
 
 function onLoad(event) {
   Services.obs.addObserver(onEngineSync, "weave:engine:sync:finish", false);
diff --git a/application/palemoon/base/content/sync/quota.js b/application/palemoon/base/content/sync/quota.js
index 7117a2ddf..454052754 100644
--- a/application/palemoon/base/content/sync/quota.js
+++ b/application/palemoon/base/content/sync/quota.js
@@ -10,7 +10,7 @@ const Cu = Components.utils;
 Cu.import("resource://services-sync/main.js");
 Cu.import("resource://gre/modules/DownloadUtils.jsm");
 
-let gSyncQuota = {
+var gSyncQuota = {
 
   init: function init() {
     this.bundle = document.getElementById("quotaStrings");
@@ -86,7 +86,7 @@ let gSyncQuota = {
 
 };
 
-let gUsageTreeView = {
+var gUsageTreeView = {
 
   _ignored: {keys: true,
              meta: true,
diff --git a/application/palemoon/base/content/sync/utils.js b/application/palemoon/base/content/sync/utils.js
index 0c02b5bc0..d41ecf18a 100644
--- a/application/palemoon/base/content/sync/utils.js
+++ b/application/palemoon/base/content/sync/utils.js
@@ -8,7 +8,7 @@
 const PERMISSIONS_RWUSR = 0x180;
 
 // Weave should always exist before before this file gets included.
-let gSyncUtils = {
+var gSyncUtils = {
   get bundle() {
     delete this.bundle;
     return this.bundle = Services.strings.createBundle("chrome://browser/locale/syncSetup.properties");
diff --git a/application/palemoon/components/downloads/DownloadsCommon.jsm b/application/palemoon/components/downloads/DownloadsCommon.jsm
index 0921f8400..c6614e780 100644
--- a/application/palemoon/components/downloads/DownloadsCommon.jsm
+++ b/application/palemoon/components/downloads/DownloadsCommon.jsm
@@ -104,7 +104,7 @@ const kPartialDownloadSuffix = ".part";
 
 const kPrefBranch = Services.prefs.getBranch("browser.download.");
 
-let PrefObserver = {
+var PrefObserver = {
   QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver,
                                          Ci.nsISupportsWeakReference]),
   getPref: function PO_getPref(name) {
diff --git a/application/palemoon/components/downloads/content/contentAreaDownloadsView.js b/application/palemoon/components/downloads/content/contentAreaDownloadsView.js
index 29e2e368c..fbb18ab04 100644
--- a/application/palemoon/components/downloads/content/contentAreaDownloadsView.js
+++ b/application/palemoon/components/downloads/content/contentAreaDownloadsView.js
@@ -4,7 +4,7 @@
 
 Components.utils.import("resource://gre/modules/PrivateBrowsingUtils.jsm");
 
-let ContentAreaDownloadsView = {
+var ContentAreaDownloadsView = {
   init: function CADV_init() {
     let view = new DownloadsPlacesView(document.getElementById("downloadsRichListBox"));
     // Do not display the Places downloads in private windows
diff --git a/application/palemoon/components/places/content/controller.js b/application/palemoon/components/places/content/controller.js
index 4d3773905..e2ae2afb0 100644
--- a/application/palemoon/components/places/content/controller.js
+++ b/application/palemoon/components/places/content/controller.js
@@ -1603,7 +1603,7 @@ PlacesController.prototype = {
  * the view that the item(s) have been dropped on was not necessarily active.
  * Drop functions are passed the view that is being dropped on.
  */
-let PlacesControllerDragHelper = {
+var PlacesControllerDragHelper = {
   /**
    * DOM Element currently being dragged over
    */
diff --git a/application/palemoon/components/places/content/places.js b/application/palemoon/components/places/content/places.js
index 9ecdfebe0..a94193823 100644
--- a/application/palemoon/components/places/content/places.js
+++ b/application/palemoon/components/places/content/places.js
@@ -1377,7 +1377,7 @@ var ViewMenu = {
   }
 }
 
-let ContentArea = {
+var ContentArea = {
   _specialViews: new Map(),
 
   init: function CA_init() {
@@ -1511,7 +1511,7 @@ let ContentArea = {
   }
 };
 
-let ContentTree = {
+var ContentTree = {
   init: function CT_init() {
     this._view = document.getElementById("placeContent");
   },
diff --git a/application/palemoon/components/preferences/aboutPermissions.js b/application/palemoon/components/preferences/aboutPermissions.js
index 106d45f89..31b48f88e 100644
--- a/application/palemoon/components/preferences/aboutPermissions.js
+++ b/application/palemoon/components/preferences/aboutPermissions.js
@@ -13,15 +13,15 @@ Cu.import("resource://gre/modules/AddonManager.jsm");
 Cu.import("resource://gre/modules/NetUtil.jsm");
 Cu.import("resource://gre/modules/ForgetAboutSite.jsm");
 
-let gFaviconService = Cc["@mozilla.org/browser/favicon-service;1"].
+var gFaviconService = Cc["@mozilla.org/browser/favicon-service;1"].
                       getService(Ci.nsIFaviconService);
 
-let gPlacesDatabase = Cc["@mozilla.org/browser/nav-history-service;1"].
+var gPlacesDatabase = Cc["@mozilla.org/browser/nav-history-service;1"].
                       getService(Ci.nsPIPlacesDatabase).
                       DBConnection.
                       clone(true);
 
-let gSitesStmt = gPlacesDatabase.createAsyncStatement(
+var gSitesStmt = gPlacesDatabase.createAsyncStatement(
                   "SELECT get_unreversed_host(rev_host) AS host " +
                   "FROM moz_places " +
                   "WHERE rev_host > '.' " +
@@ -30,12 +30,12 @@ let gSitesStmt = gPlacesDatabase.createAsyncStatement(
                   "ORDER BY MAX(frecency) DESC " +
                   "LIMIT :limit");
 
-let gVisitStmt = gPlacesDatabase.createAsyncStatement(
+var gVisitStmt = gPlacesDatabase.createAsyncStatement(
                   "SELECT SUM(visit_count) AS count " +
                   "FROM moz_places " +
                   "WHERE rev_host = :rev_host");
 
-let gFlash = {
+var gFlash = {
   name: "Shockwave Flash",
   betterName: "Adobe Flash",
   type: "application/x-shockwave-flash",
@@ -290,7 +290,7 @@ Site.prototype = {
  *
  * Inspired by pageinfo/permissions.js
  */
-let PermissionDefaults = {
+var PermissionDefaults = {
   UNKNOWN: Ci.nsIPermissionManager.UNKNOWN_ACTION,   // 0
   ALLOW: Ci.nsIPermissionManager.ALLOW_ACTION,       // 1
   DENY: Ci.nsIPermissionManager.DENY_ACTION,         // 2
@@ -449,7 +449,7 @@ let PermissionDefaults = {
 /**
  * AboutPermissions manages the about:permissions page.
  */
-let AboutPermissions = {
+var AboutPermissions = {
  /**
   * Maximum number of sites to return from the places database.
   */  
diff --git a/application/palemoon/components/preferences/sanitize.js b/application/palemoon/components/preferences/sanitize.js
index 893155e62..15e6f58f4 100644
--- a/application/palemoon/components/preferences/sanitize.js
+++ b/application/palemoon/components/preferences/sanitize.js
@@ -3,7 +3,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-let gSanitizeDialog = Object.freeze({
+var gSanitizeDialog = Object.freeze({
   onClearHistoryChanged: function () {
     let downloadsPref = document.getElementById("privacy.clearOnShutdown.downloads");
     let historyPref = document.getElementById("privacy.clearOnShutdown.history");
diff --git a/application/palemoon/components/preferences/sync.js b/application/palemoon/components/preferences/sync.js
index 9c7f1aa1f..f29728dbf 100644
--- a/application/palemoon/components/preferences/sync.js
+++ b/application/palemoon/components/preferences/sync.js
@@ -9,7 +9,7 @@ const PAGE_NO_ACCOUNT = 0;
 const PAGE_HAS_ACCOUNT = 1;
 const PAGE_NEEDS_UPDATE = 2;
 
-let gSyncPane = {
+var gSyncPane = {
   _stringBundle: null,
   prefArray: ["engine.bookmarks", "engine.passwords", "engine.prefs",
               "engine.tabs", "engine.history"],
diff --git a/application/palemoon/components/sessionstore/SessionStorage.jsm b/application/palemoon/components/sessionstore/SessionStorage.jsm
index 192352c49..64aef35a5 100644
--- a/application/palemoon/components/sessionstore/SessionStorage.jsm
+++ b/application/palemoon/components/sessionstore/SessionStorage.jsm
@@ -38,7 +38,7 @@ this.SessionStorage = {
 
 Object.freeze(SessionStorage);
 
-let DomStorage = {
+var DomStorage = {
   /**
    * Reads all session storage data from the given docShell.
    * @param aDocShell
@@ -142,7 +142,7 @@ let DomStorage = {
   }
 };
 
-let History = {
+var History = {
   /**
    * Returns a given history entry's URI.
    * @param aHistory
diff --git a/application/palemoon/components/sessionstore/SessionStore.jsm b/application/palemoon/components/sessionstore/SessionStore.jsm
index a8e7adfcc..f7c495be8 100644
--- a/application/palemoon/components/sessionstore/SessionStore.jsm
+++ b/application/palemoon/components/sessionstore/SessionStore.jsm
@@ -88,7 +88,7 @@ XPCOMUtils.defineLazyServiceGetter(this, "gScreenManager",
 // retrieved from a given docShell if not already collected before.
 // This is made so they're automatically in sync with all nsIDocShell.allow*
 // properties.
-let gDocShellCapabilities = (function () {
+var gDocShellCapabilities = (function () {
   let caps;
 
   return docShell => {
@@ -247,7 +247,7 @@ this.SessionStore = {
 // Freeze the SessionStore object. We don't want anyone to modify it.
 Object.freeze(SessionStore);
 
-let SessionStoreInternal = {
+var SessionStoreInternal = {
   QueryInterface: XPCOMUtils.generateQI([
     Ci.nsIDOMEventListener,
     Ci.nsIObserver,
@@ -4471,7 +4471,7 @@ let SessionStoreInternal = {
  * pinned, visible and hidden tabs in that and FIFO order. Hidden tabs are only
  * restored with restore_hidden_tabs=true.
  */
-let TabRestoreQueue = {
+var TabRestoreQueue = {
   // The separate buckets used to store tabs.
   tabs: {priority: [], visible: [], hidden: []},
 
@@ -4608,7 +4608,7 @@ let TabRestoreQueue = {
 // A map storing a closed window's state data until it goes aways (is GC'ed).
 // This ensures that API clients can still read (but not write) states of
 // windows they still hold a reference to but we don't.
-let DyingWindowCache = {
+var DyingWindowCache = {
   _data: new WeakMap(),
 
   has: function (window) {
@@ -4631,7 +4631,7 @@ let DyingWindowCache = {
 // A set of tab attributes to persist. We will read a given list of tab
 // attributes when collecting tab data and will re-set those attributes when
 // the given tab data is restored to a new tab.
-let TabAttributes = {
+var TabAttributes = {
   _attrs: new Set(),
 
   // We never want to directly read or write those attributes.
@@ -4677,7 +4677,7 @@ let TabAttributes = {
 // This is used to help meter the number of restoring tabs. This is the control
 // point for telling the next tab to restore. It gets attached to each gBrowser
 // via gBrowser.addTabsProgressListener
-let gRestoreTabsProgressListener = {
+var gRestoreTabsProgressListener = {
   onStateChange: function(aBrowser, aWebProgress, aRequest, aStateFlags, aStatus) {
     // Ignore state changes on browsers that we've already restored and state
     // changes that aren't applicable.
diff --git a/application/palemoon/components/sessionstore/_SessionFile.jsm b/application/palemoon/components/sessionstore/_SessionFile.jsm
index 9d40b9cca..62b4d1687 100644
--- a/application/palemoon/components/sessionstore/_SessionFile.jsm
+++ b/application/palemoon/components/sessionstore/_SessionFile.jsm
@@ -130,7 +130,7 @@ const TaskUtils = {
   }
 };
 
-let SessionFileInternal = {
+var SessionFileInternal = {
   /**
    * A promise fulfilled once initialization is complete
    */
diff --git a/application/palemoon/components/sessionstore/nsSessionStartup.js b/application/palemoon/components/sessionstore/nsSessionStartup.js
index 7f07e9050..04037c10e 100644
--- a/application/palemoon/components/sessionstore/nsSessionStartup.js
+++ b/application/palemoon/components/sessionstore/nsSessionStartup.js
@@ -50,7 +50,7 @@ function debug(aMsg) {
   Services.console.logStringMessage(aMsg);
 }
 
-let gOnceInitializedDeferred = Promise.defer();
+var gOnceInitializedDeferred = Promise.defer();
 
 /* :::::::: The Service ::::::::::::::: */
 
diff --git a/application/palemoon/components/shell/ShellService.jsm b/application/palemoon/components/shell/ShellService.jsm
index 12e275bdb..74632b692 100644
--- a/application/palemoon/components/shell/ShellService.jsm
+++ b/application/palemoon/components/shell/ShellService.jsm
@@ -17,7 +17,7 @@ XPCOMUtils.defineLazyModuleGetter(this, "WindowsRegistry",
 /**
  * Internal functionality to save and restore the docShell.allow* properties.
  */
-let ShellServiceInternal = {
+var ShellServiceInternal = {
   /**
    * Used to determine whether or not to offer "Set as desktop background"
    * functionality. Even if shell service is available it is not
diff --git a/application/palemoon/modules/BrowserNewTabPreloader.jsm b/application/palemoon/modules/BrowserNewTabPreloader.jsm
index 719a9e05e..778698fba 100644
--- a/application/palemoon/modules/BrowserNewTabPreloader.jsm
+++ b/application/palemoon/modules/BrowserNewTabPreloader.jsm
@@ -79,7 +79,7 @@ this.BrowserNewTabPreloader = {
 
 Object.freeze(BrowserNewTabPreloader);
 
-let Initializer = {
+var Initializer = {
   _timer: null,
   _observing: false,
 
@@ -120,7 +120,7 @@ let Initializer = {
   }
 };
 
-let Preferences = {
+var Preferences = {
   _enabled: null,
   _branch: null,
 
@@ -157,7 +157,7 @@ let Preferences = {
   },
 };
 
-let HiddenBrowsers = {
+var HiddenBrowsers = {
   _browsers: null,
   _updateTimer: null,
 
@@ -379,7 +379,7 @@ HiddenBrowser.prototype = {
   }
 };
 
-let HostFrame = {
+var HostFrame = {
   _frame: null,
   _deferred: null,
 
diff --git a/application/palemoon/modules/FormSubmitObserver.jsm b/application/palemoon/modules/FormSubmitObserver.jsm
index 72c5ca601..e4d3e765e 100644
--- a/application/palemoon/modules/FormSubmitObserver.jsm
+++ b/application/palemoon/modules/FormSubmitObserver.jsm
@@ -9,14 +9,14 @@
 
 "use strict";
 
-let Cc = Components.classes;
-let Ci = Components.interfaces;
-let Cu = Components.utils;
-
-let HTMLInputElement = Ci.nsIDOMHTMLInputElement;
-let HTMLTextAreaElement = Ci.nsIDOMHTMLTextAreaElement;
-let HTMLSelectElement = Ci.nsIDOMHTMLSelectElement;
-let HTMLButtonElement = Ci.nsIDOMHTMLButtonElement;
+var Cc = Components.classes;
+var Ci = Components.interfaces;
+var Cu = Components.utils;
+
+var HTMLInputElement = Ci.nsIDOMHTMLInputElement;
+var HTMLTextAreaElement = Ci.nsIDOMHTMLTextAreaElement;
+var HTMLSelectElement = Ci.nsIDOMHTMLSelectElement;
+var HTMLButtonElement = Ci.nsIDOMHTMLButtonElement;
 
 this.EXPORTED_SYMBOLS = [ "FormSubmitObserver" ];
 
diff --git a/application/palemoon/modules/FormValidationHandler.jsm b/application/palemoon/modules/FormValidationHandler.jsm
index 05be510e1..ef7c2108b 100644
--- a/application/palemoon/modules/FormValidationHandler.jsm
+++ b/application/palemoon/modules/FormValidationHandler.jsm
@@ -8,15 +8,15 @@
 
 "use strict";
 
-let Cc = Components.classes;
-let Ci = Components.interfaces;
-let Cu = Components.utils;
+var Cc = Components.classes;
+var Ci = Components.interfaces;
+var Cu = Components.utils;
 
 this.EXPORTED_SYMBOLS = [ "FormValidationHandler" ];
 
 Cu.import("resource://gre/modules/Services.jsm");
 
-let FormValidationHandler =
+var FormValidationHandler =
 {
   _panel: null,
   _anchor: null,
diff --git a/application/palemoon/modules/NetworkPrioritizer.jsm b/application/palemoon/modules/NetworkPrioritizer.jsm
index ea4a87790..23d688a30 100644
--- a/application/palemoon/modules/NetworkPrioritizer.jsm
+++ b/application/palemoon/modules/NetworkPrioritizer.jsm
@@ -34,8 +34,8 @@ const PRIORITY_DELTA = -10;
 
 
 // Variables
-let _lastFocusedWindow = null;
-let _windows = [];
+var _lastFocusedWindow = null;
+var _windows = [];
 
 
 // Exported symbol
@@ -64,7 +64,7 @@ function _handleEvent(aEvent) {
 
 
 // Methods that impact a browser. Put into single object for organization.
-let BrowserHelper = {
+var BrowserHelper = {
   onOpen: function NP_BH_onOpen(aBrowser) {
     // If the tab is in the focused window, leave priority as it is
     if (aBrowser.ownerDocument.defaultView != _lastFocusedWindow)
@@ -91,7 +91,7 @@ let BrowserHelper = {
 
 
 // Methods that impact a window. Put into single object for organization.
-let WindowHelper = {
+var WindowHelper = {
   addWindow: function NP_WH_addWindow(aWindow) {
     // Build internal data object
     _windows.push({ window: aWindow, lastSelectedBrowser: null });
diff --git a/application/palemoon/modules/PopupNotifications.jsm b/application/palemoon/modules/PopupNotifications.jsm
index 9b2e8e5d1..d2faf52c3 100644
--- a/application/palemoon/modules/PopupNotifications.jsm
+++ b/application/palemoon/modules/PopupNotifications.jsm
@@ -18,8 +18,8 @@ const ICON_ATTRIBUTE_SHOWING = "showing";
 
 const PREF_SECURITY_DELAY = "security.notification_enable_delay";
 
-let popupNotificationsMap = new WeakMap();
-let gNotificationParents = new WeakMap;
+var popupNotificationsMap = new WeakMap();
+var gNotificationParents = new WeakMap;
 
 function getAnchorFromBrowser(aBrowser) {
   let anchor = aBrowser.getAttribute("popupnotificationanchor") ||
diff --git a/application/palemoon/modules/SharedFrame.jsm b/application/palemoon/modules/SharedFrame.jsm
index 4d248ae5b..b9d59bfa9 100644
--- a/application/palemoon/modules/SharedFrame.jsm
+++ b/application/palemoon/modules/SharedFrame.jsm
@@ -18,7 +18,7 @@ const Cu = Components.utils;
  * when another one of the placeholder is meant to be displayed.
  * */
 
-let Frames = new Map();
+var Frames = new Map();
 
 /**
  * The Frames map is the main data structure that holds information
diff --git a/application/palemoon/modules/openLocationLastURL.jsm b/application/palemoon/modules/openLocationLastURL.jsm
index 0d653df28..3f58db8ce 100644
--- a/application/palemoon/modules/openLocationLastURL.jsm
+++ b/application/palemoon/modules/openLocationLastURL.jsm
@@ -10,11 +10,11 @@ Components.utils.import("resource://gre/modules/PrivateBrowsingUtils.jsm");
 
 this.EXPORTED_SYMBOLS = [ "OpenLocationLastURL" ];
 
-let prefSvc = Components.classes["@mozilla.org/preferences-service;1"]
+var prefSvc = Components.classes["@mozilla.org/preferences-service;1"]
                         .getService(Components.interfaces.nsIPrefBranch);
-let gOpenLocationLastURLData = "";
+var gOpenLocationLastURLData = "";
 
-let observer = {
+var observer = {
   QueryInterface: function (aIID) {
     if (aIID.equals(Components.interfaces.nsIObserver) ||
         aIID.equals(Components.interfaces.nsISupports) ||
@@ -35,7 +35,7 @@ let observer = {
   }
 };
 
-let os = Components.classes["@mozilla.org/observer-service;1"]
+var os = Components.classes["@mozilla.org/observer-service;1"]
                    .getService(Components.interfaces.nsIObserverService);
 os.addObserver(observer, "last-pb-context-exited", true);
 os.addObserver(observer, "browser:purge-session-history", true);
diff --git a/application/palemoon/modules/promise.js b/application/palemoon/modules/promise.js
index 7c96f02cf..74065c8db 100644
--- a/application/palemoon/modules/promise.js
+++ b/application/palemoon/modules/promise.js
@@ -24,7 +24,7 @@ module.metadata = {
   'stability': 'unstable'
 };
 
-let promised = (function() {
+var promised = (function() {
   // Note: Define shortcuts and utility functions here in order to avoid
   // slower property accesses and unnecessary closure creations on each
   // call of this popular function.
-- 
cgit v1.2.3


From cf58e417d45d45a258d7a9383a1d477d8035532c Mon Sep 17 00:00:00 2001
From: JustOff <Off.Just.Off@gmail.com>
Date: Mon, 16 Apr 2018 16:21:19 +0300
Subject: [PALEMOON] Remove accidentally duplicated 'malformedURI.title' from
 netError.dtd

---
 application/palemoon/locales/en-US/chrome/overrides/netError.dtd | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'application/palemoon')

diff --git a/application/palemoon/locales/en-US/chrome/overrides/netError.dtd b/application/palemoon/locales/en-US/chrome/overrides/netError.dtd
index 51aedb275..c97bd1b59 100644
--- a/application/palemoon/locales/en-US/chrome/overrides/netError.dtd
+++ b/application/palemoon/locales/en-US/chrome/overrides/netError.dtd
@@ -51,7 +51,6 @@
 <p>&brandShortName; can’t load this page for some reason.</p>
 ">
 
-<!ENTITY malformedURI.title "The address isn't valid">
 <!ENTITY captivePortal.title "Login to network">
 <!ENTITY captivePortal.longDesc "
 <p>This network may require you to login to access the internet.</p>
@@ -59,7 +58,7 @@
 
 <!ENTITY openPortalLoginPage.label "Open Login Page">
 
-<!ENTITY malformedURI.title "The address isn’t valid">
+<!ENTITY malformedURI.title "The address isn't valid">
 <!ENTITY malformedURI.longDesc "
 <ul>
   <li>Web addresses are usually written like
-- 
cgit v1.2.3


From 8a5c700e4e91c3bb04a5a4768a90a76489942beb Mon Sep 17 00:00:00 2001
From: "Matt A. Tobin" <email@mattatobin.com>
Date: Mon, 16 Apr 2018 11:20:39 -0400
Subject: [PALEMOON] Update UA Compatibility modes in a backwards compatible
 way

---
 .../palemoon/base/content/browser-uacompat.js      | 45 ++++++++++++++++++++++
 application/palemoon/base/content/browser.js       |  5 +++
 .../branding/official/pref/palemoon-branding.js    |  2 +
 .../branding/unstable/pref/palemoon-branding.js    |  2 +
 4 files changed, 54 insertions(+)
 create mode 100644 application/palemoon/base/content/browser-uacompat.js

(limited to 'application/palemoon')

diff --git a/application/palemoon/base/content/browser-uacompat.js b/application/palemoon/base/content/browser-uacompat.js
new file mode 100644
index 000000000..933aa55d1
--- /dev/null
+++ b/application/palemoon/base/content/browser-uacompat.js
@@ -0,0 +1,45 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+var UserAgentCompatibility = {
+  PREF_UA_COMPAT: "general.useragent.compatMode",
+  PREF_UA_COMPAT_GECKO: "general.useragent.compatMode.gecko",
+  PREF_UA_COMPAT_FIREFOX: "general.useragent.compatMode.firefox",
+  
+  init: function() {
+    this.checkPreferences();
+    Services.prefs.addObserver(this.PREF_UA_COMPAT, this, false);
+    Services.prefs.addObserver(this.PREF_UA_COMPAT_GECKO, this, false);
+    Services.prefs.addObserver(this.PREF_UA_COMPAT_FIREFOX, this, false);
+  },
+
+  uninit: function() {
+    Services.prefs.removeObserver(this.PREF_UA_COMPAT, this, false);
+    Services.prefs.removeObserver(this.PREF_UA_COMPAT_GECKO, this, false);
+    Services.prefs.removeObserver(this.PREF_UA_COMPAT_FIREFOX, this, false);
+  },
+
+  observe: function() {
+    this.checkPreferences();
+  },
+  
+  checkPreferences: function() {
+    var compatMode = Services.prefs.getIntPref(this.PREF_UA_COMPAT);
+    
+    switch(compatMode) {
+      case 0:
+        Services.prefs.setBoolPref(this.PREF_UA_COMPAT_GECKO, false);
+        Services.prefs.setBoolPref(this.PREF_UA_COMPAT_FIREFOX, false);
+        break;
+      case 1:
+        Services.prefs.setBoolPref(this.PREF_UA_COMPAT_GECKO, true);
+        Services.prefs.setBoolPref(this.PREF_UA_COMPAT_FIREFOX, false);
+        break;
+      case 2:
+        Services.prefs.setBoolPref(this.PREF_UA_COMPAT_GECKO, true);
+        Services.prefs.setBoolPref(this.PREF_UA_COMPAT_FIREFOX, true);
+        break;
+    }
+  }
+};
diff --git a/application/palemoon/base/content/browser.js b/application/palemoon/base/content/browser.js
index fc2e63393..c9f0aa4aa 100644
--- a/application/palemoon/base/content/browser.js
+++ b/application/palemoon/base/content/browser.js
@@ -7,6 +7,7 @@ var Ci = Components.interfaces;
 var Cu = Components.utils;
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource:///modules/RecentWindow.jsm");
 
 XPCOMUtils.defineLazyModuleGetter(this, "CharsetMenu",
@@ -141,6 +142,7 @@ let gInitialPages = [
 #include browser-plugins.js
 #include browser-tabPreviews.js
 #include browser-thumbnails.js
+#include browser-uacompat.js
 
 #ifdef MOZ_WEBRTC
 #include browser-webrtcUI.js
@@ -917,6 +919,7 @@ var gBrowserInit = {
     TabsInTitlebar.init();
     retrieveToolbarIconsizesFromTheme();
     ToolbarIconColor.init();
+    UserAgentCompatibility.init();
 
 #ifdef XP_WIN
     if (window.matchMedia("(-moz-os-version: windows-win8)").matches &&
@@ -1293,6 +1296,8 @@ var gBrowserInit = {
     DevToolsTheme.uninit();
 #endif
 
+    UserAgentCompatibility.uninit();
+
     var enumerator = Services.wm.getEnumerator(null);
     enumerator.getNext();
     if (!enumerator.hasMoreElements()) {
diff --git a/application/palemoon/branding/official/pref/palemoon-branding.js b/application/palemoon/branding/official/pref/palemoon-branding.js
index 4f5d196d7..8e8703fb7 100644
--- a/application/palemoon/branding/official/pref/palemoon-branding.js
+++ b/application/palemoon/branding/official/pref/palemoon-branding.js
@@ -8,6 +8,8 @@ pref("app.releaseNotesURL", "http://www.palemoon.org/releasenotes.shtml");
 
 // Enable Firefox compatmode by default.
 pref("general.useragent.compatMode", 2);
+pref("general.useragent.compatMode.gecko", true);
+pref("general.useragent.compatMode.firefox", true);
 
 // ========================= updates ========================
 #if defined(XP_WIN)
diff --git a/application/palemoon/branding/unstable/pref/palemoon-branding.js b/application/palemoon/branding/unstable/pref/palemoon-branding.js
index 4c088f76d..dda6f86a5 100644
--- a/application/palemoon/branding/unstable/pref/palemoon-branding.js
+++ b/application/palemoon/branding/unstable/pref/palemoon-branding.js
@@ -8,6 +8,8 @@ pref("app.releaseNotesURL", "http://www.palemoon.org/unstable/releasenotes.shtml
 
 // Enable Firefox compatmode by default.
 pref("general.useragent.compatMode", 2);
+pref("general.useragent.compatMode.gecko", true);
+pref("general.useragent.compatMode.firefox", true);
 
 // ========================= updates ========================
 #if defined(XP_WIN)
-- 
cgit v1.2.3


From 0763852cb706eb78d9a48583bf1bdc588e3c0bc8 Mon Sep 17 00:00:00 2001
From: New Tobin Paradigm <email@mattatobin.com>
Date: Mon, 16 Apr 2018 15:24:14 +0000
Subject: Revert "[PALEMOON] Fix a warning: "unreachable code after return
 statement" in urlbarBindings.xml"

---
 application/palemoon/base/content/urlbarBindings.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'application/palemoon')

diff --git a/application/palemoon/base/content/urlbarBindings.xml b/application/palemoon/base/content/urlbarBindings.xml
index ce7de3665..c99819f0d 100644
--- a/application/palemoon/base/content/urlbarBindings.xml
+++ b/application/palemoon/base/content/urlbarBindings.xml
@@ -1913,7 +1913,7 @@
             viewsLeft = 0;
             return;
             // XXX
-            /*
+            
             if (Services.prefs.prefHasUserValue("services.sync.username") &&
                this._notificationType != "addons-sync-disabled") {
               // If the user has already setup Sync, don't show the notification.
@@ -1947,7 +1947,6 @@
               this._promomessage.firstChild.textContent = this._notificationMessage;
               this._promomessage.height = this._promomessage.getBoundingClientRect().height;
             }.bind(this), true);
-            */
           }
         ]]></body>
       </method>
-- 
cgit v1.2.3


From a4cc727dafa2ea17be23ca9ea2075072631de769 Mon Sep 17 00:00:00 2001
From: JustOff <Off.Just.Off@gmail.com>
Date: Mon, 16 Apr 2018 19:09:53 +0300
Subject: Remove the Sync promotion in the add-on install doorhanger

---
 application/palemoon/base/content/browser.css      |   4 -
 application/palemoon/base/content/browser.xul      |   1 -
 .../palemoon/base/content/urlbarBindings.xml       | 189 ---------------------
 .../en-US/chrome/browser/browser.properties        |  20 ---
 application/palemoon/themes/linux/browser.css      |  23 ---
 application/palemoon/themes/osx/browser.css        |  35 ----
 application/palemoon/themes/windows/browser.css    |  36 ----
 7 files changed, 308 deletions(-)

(limited to 'application/palemoon')

diff --git a/application/palemoon/base/content/browser.css b/application/palemoon/base/content/browser.css
index 24cbb9d8e..4865cfee7 100644
--- a/application/palemoon/base/content/browser.css
+++ b/application/palemoon/base/content/browser.css
@@ -631,10 +631,6 @@ statuspanel[inactive][previoustype=overLink] {
   -moz-box-align: end;
 }
 
-.panel-inner-arrowcontentfooter[footertype="promobox"] {
-  -moz-binding: url("chrome://browser/content/urlbarBindings.xml#promobox");
-}
-
 /* highlighter */
 %include highlighter.css
 
diff --git a/application/palemoon/base/content/browser.xul b/application/palemoon/base/content/browser.xul
index 8a79890cd..ea9c3f969 100644
--- a/application/palemoon/base/content/browser.xul
+++ b/application/palemoon/base/content/browser.xul
@@ -153,7 +153,6 @@
 
     <panel id="editBookmarkPanel"
            type="arrow"
-           footertype="promobox"
            orient="vertical"
            ignorekeys="true"
            consumeoutsideclicks="true"
diff --git a/application/palemoon/base/content/urlbarBindings.xml b/application/palemoon/base/content/urlbarBindings.xml
index c99819f0d..8cc66f642 100644
--- a/application/palemoon/base/content/urlbarBindings.xml
+++ b/application/palemoon/base/content/urlbarBindings.xml
@@ -1764,195 +1764,6 @@
     </implementation>
   </binding>
 
- <binding id="promobox">
-    <content>
-      <xul:hbox class="panel-promo-box" align="start" flex="1">
-        <xul:hbox align="center" flex="1">
-          <xul:image class="panel-promo-icon"/>
-          <xul:description anonid="promo-message" class="panel-promo-message" flex="1">
-            <xul:description anonid="promo-link"
-                             class="plain text-link inline-link"
-                             onclick="document.getBindingParent(this).onLinkClick();"/>
-          </xul:description>
-        </xul:hbox>
-        <xul:toolbarbutton class="panel-promo-closebutton close-icon"
-                           oncommand="document.getBindingParent(this).onCloseButtonCommand();"
-                           tooltiptext="&closeNotification.tooltip;"/>
-      </xul:hbox>
-    </content>
-
-    <implementation implements="nsIDOMEventListener">
-      <constructor><![CDATA[
-        this._panel.addEventListener("popupshowing", this, false);
-      ]]></constructor>
-
-      <destructor><![CDATA[
-        this._panel.removeEventListener("popupshowing", this, false);
-      ]]></destructor>
-
-      <field name="_panel" readonly="true"><![CDATA[
-        let node = this.parentNode;
-        while(node && node.localName != "panel") {
-          node = node.parentNode;
-        }
-        node;
-      ]]></field>
-      <field name="_promomessage" readonly="true">
-        document.getAnonymousElementByAttribute(this, "anonid", "promo-message");
-      </field>
-      <field name="_promolink" readonly="true">
-        document.getAnonymousElementByAttribute(this, "anonid", "promo-link");
-      </field>
-      <field name="_brandBundle" readonly="true">
-        Services.strings.createBundle("chrome://branding/locale/brand.properties");
-      </field>
-      <property name="_viewsLeftMap">
-        <getter><![CDATA[
-          let viewsLeftMap = {};
-          try {
-            viewsLeftMap = JSON.parse(Services.prefs.getCharPref("browser.syncPromoViewsLeftMap"));
-          } catch (ex) {
-            // If the old preference exists, migrate it to the new one.
-            try {
-              let oldPref = Services.prefs.getIntPref("browser.syncPromoViewsLeft");
-              Services.prefs.clearUserPref("browser.syncPromoViewsLeft");
-              viewsLeftMap.bookmarks = oldPref;
-              viewsLeftMap.passwords = oldPref;
-              Services.prefs.setCharPref("browser.syncPromoViewsLeftMap",
-                                         JSON.stringify(viewsLeftMap));
-            } catch (ex2) {}
-          }
-          return viewsLeftMap;
-        ]]></getter>
-      </property>
-      <property name="_viewsLeft">
-        <getter><![CDATA[
-          let views = 5;
-          let map = this._viewsLeftMap;
-          if (this._notificationType in map) {
-            views = map[this._notificationType];
-          }
-          return views;
-        ]]></getter>
-        <setter><![CDATA[
-          let map = this._viewsLeftMap;
-          map[this._notificationType] = val;
-          Services.prefs.setCharPref("browser.syncPromoViewsLeftMap",
-                                     JSON.stringify(map));
-          return val;
-        ]]></setter>
-      </property>
-      <property name="_notificationType">
-        <getter><![CDATA[
-          // Use the popupid attribute to identify the notification type,
-          // otherwise just rely on the panel id for common arrowpanels.
-          let type = this._panel.firstChild.getAttribute("popupid") ||
-                     this._panel.id;
-          if (type.startsWith("password-"))
-            return "passwords";
-          if (type == "editBookmarkPanel")
-            return "bookmarks";
-          if (type == "addon-install-complete") {
-            if (!Services.prefs.prefHasUserValue("services.sync.username"))
-              return "addons";
-            if (!Services.prefs.getBoolPref("services.sync.engine.addons"))
-              return "addons-sync-disabled";
-          }
-          return null;
-        ]]></getter>
-      </property>
-      <property name="_notificationMessage">
-        <getter><![CDATA[
-          return gNavigatorBundle.getFormattedString(
-            "syncPromoNotification." + this._notificationType + ".description",
-            [this._brandBundle.GetStringFromName("syncBrandShortName")]
-          );
-        ]]></getter>
-      </property>
-      <property name="_notificationLink">
-        <getter><![CDATA[
-          if (this._notificationType == "addons-sync-disabled") {
-            return "https://forum.palemoon.org/viewforum.php?f=52";
-          }
-          return "http://www.palemoon.org/sync/";
-        ]]></getter>
-      </property>
-      <method name="onCloseButtonCommand">
-        <body><![CDATA[
-          this._viewsLeft = 0;
-          this.hidden = true;
-        ]]></body>
-      </method>
-      <method name="onLinkClick">
-        <body><![CDATA[
-          // Open a new selected tab and close the current panel.
-          gBrowser.loadOneTab(this._promolink.getAttribute("href"),
-                              { inBackground: false });
-          this._panel.hidePopup();
-        ]]></body>
-      </method>
-      <method name="handleEvent">
-        <parameter name="event"/>
-        <body><![CDATA[
-          if (event.type != "popupshowing" || event.target != this._panel)
-            return;
-
-          // A previous notification may have unhidden this.
-          this.hidden = true;
-
-          // Only handle supported notification panels.
-          if (!this._notificationType) {
-            return;
-          }
-
-          let viewsLeft = this._viewsLeft;
-          if (viewsLeft) {
-            // XXX: Short-circuit this for now.
-            // TO-DO: Clean up this code for sync promotion
-            this._viewsLeft = 0;
-            viewsLeft = 0;
-            return;
-            // XXX
-            
-            if (Services.prefs.prefHasUserValue("services.sync.username") &&
-               this._notificationType != "addons-sync-disabled") {
-              // If the user has already setup Sync, don't show the notification.
-              this._viewsLeft = 0;
-              // Be sure to hide the panel, in case it was visible and the user
-              // decided to setup Sync after noticing it.
-              viewsLeft = 0;
-              // The panel is still hidden, just bail out.
-              return;
-            }
-            else {
-              this._viewsLeft = viewsLeft - 1;
-            }
-
-            this._promolink.setAttribute("href", this._notificationLink);
-            this._promolink.value = gNavigatorBundle.getString("syncPromoNotification.learnMoreLinkText");
-
-            this.hidden = false;
-
-            // HACK: The description element doesn't wrap correctly in panels,
-            // thus set a width on it, based on the available space, before
-            // setting its textContent.  Then set its height as well, to
-            // fix wrong height calculation on Linux (bug 659578).
-            this._panel.addEventListener("popupshown", function panelShown() {
-              this._panel.removeEventListener("popupshown", panelShown, true);
-              // Previous popupShown events may close the panel or change
-              // its contents, so ensure this is still valid.
-              if (this._panel.state != "open" || !this._notificationType)
-                return;
-              this._promomessage.width = this._promomessage.getBoundingClientRect().width;
-              this._promomessage.firstChild.textContent = this._notificationMessage;
-              this._promomessage.height = this._promomessage.getBoundingClientRect().height;
-            }.bind(this), true);
-          }
-        ]]></body>
-      </method>
-    </implementation>
-  </binding>
-
   <binding id="toolbarbutton-badged" display="xul:button"
            extends="chrome://global/content/bindings/toolbarbutton.xml#toolbarbutton">
     <content>
diff --git a/application/palemoon/locales/en-US/chrome/browser/browser.properties b/application/palemoon/locales/en-US/chrome/browser/browser.properties
index 8b3fea4d5..bf363d103 100644
--- a/application/palemoon/locales/en-US/chrome/browser/browser.properties
+++ b/application/palemoon/locales/en-US/chrome/browser/browser.properties
@@ -363,26 +363,6 @@ restartButton=Restart
 # menu, set this to "true". Otherwise, you can leave it as "false".
 browser.menu.showCharacterEncoding=false
 
-# LOCALIZATION NOTE (syncPromoNotification.bookmarks.label): This appears in
-# 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.
-# %S will be replaced by syncBrandShortName.
-# The final space separates this text from the Learn More link.
-syncPromoNotification.addons.description=You can access your add-ons on all your devices with %S.\u0020
-# LOCALIZATION NOTE (syncPromoNotification.addons-sync-disabled.label):
-# This appears in the add-on install complete panel when Sync is set
-# but addons sync is not. %S will be replaced by syncBrandShortName.
-# The final space separates this text from the Learn More link.
-syncPromoNotification.addons-sync-disabled.description=You can use your %S account to synchronize add-ons across multiple devices.\u0020
-
 # Mozilla data reporting notification (Telemetry, Firefox Health Report, etc)
 dataReportingNotification.message       = %1$S automatically sends some data to %2$S so that we can improve your experience.
 dataReportingNotification.button.label  = Choose What I Share
diff --git a/application/palemoon/themes/linux/browser.css b/application/palemoon/themes/linux/browser.css
index a396ea5fd..334062613 100644
--- a/application/palemoon/themes/linux/browser.css
+++ b/application/palemoon/themes/linux/browser.css
@@ -1559,29 +1559,6 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
   min-width: 27em;
 }
 
-.panel-promo-box {
-  margin: 8px -10px -10px -10px;
-  padding: 8px 10px;
-  border-top: 1px solid ThreeDShadow;
-  background-image: linear-gradient(hsla(0,0%,0%,.15), hsla(0,0%,0%,.08) 6px);
-}
-
-.panel-promo-icon {
-  list-style-image: url("chrome://browser/skin/sync-notification-24.png");
-  -moz-margin-end: 10px;
-  vertical-align: middle;
-}
-
-.panel-promo-closebutton {
-  margin-top: 0;
-  margin-bottom: 0;
-}
-
-.panel-promo-closebutton > .toolbarbutton-text {
-  padding: 0;
-  margin: 0;
-}
-
 /* Content area */
 #sidebar {
   background-color: Window;
diff --git a/application/palemoon/themes/osx/browser.css b/application/palemoon/themes/osx/browser.css
index aa5918bab..a66ddacfc 100644
--- a/application/palemoon/themes/osx/browser.css
+++ b/application/palemoon/themes/osx/browser.css
@@ -1338,41 +1338,6 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
     min-width: 27em;
 }
 
-.panel-promo-box {
-    margin: 10px -10px -10px;
-    padding: 8px 10px;
-    border-top: 1px solid ThreeDShadow;
-    background-image: linear-gradient(hsla(0,0%,0%,.15), hsla(0,0%,0%,.08) 6px);
-    border-bottom-left-radius: 3px;
-    border-bottom-right-radius: 3px;
-}
-
-@media (-moz-mac-lion-theme) {
-    .panel-promo-box {
-        border-top-style: none;
-        background: #f1f5fb;
-        color: GrayText;
-        box-shadow: 0px 1px 2px rgb(204,214,234) inset;
-    }
-}
-
-.panel-promo-icon {
-    list-style-image: url("chrome://browser/skin/sync-notification-24.png");
-    -moz-margin-end: 10px;
-    vertical-align: middle;
-}
-
-.panel-promo-closebutton {
-    border: none;
-    -moz-margin-end: -14px;
-    margin-top: -8px;
-}
-
-.panel-promo-closebutton > .toolbarbutton-text {
-    padding: 0;
-    margin: 0;
-}
-
 /* ::::: content area ::::: */
 
 #sidebar {
diff --git a/application/palemoon/themes/windows/browser.css b/application/palemoon/themes/windows/browser.css
index 3e8c63af4..a64955f0f 100644
--- a/application/palemoon/themes/windows/browser.css
+++ b/application/palemoon/themes/windows/browser.css
@@ -1778,42 +1778,6 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
   min-width: 27em;
 }
 
-.panel-promo-box {
-  margin: 10px -10px -10px;
-  padding: 8px 10px;
-  border-top: 1px solid ThreeDShadow;
-  background-image: linear-gradient(hsla(0,0%,0%,.15), hsla(0,0%,0%,.08) 6px);
-  border-bottom-left-radius: 3px;
-  border-bottom-right-radius: 3px;
-}
-
-@media (-moz-windows-default-theme) {
-  .panel-promo-box {
-    border-top-style: none;
-    background: #f1f5fb;
-    color: GrayText;
-    box-shadow: 0px 1px 2px rgb(204,214,234) inset;
-  }
-}
-
-.panel-promo-icon {
-  list-style-image: url("chrome://browser/skin/sync-notification-24.png");
-  -moz-margin-end: 10px;
-  vertical-align: middle;
-}
-
-.panel-promo-closebutton {
-  -moz-appearance: none;
-  border: none;
-  -moz-margin-end: -10px;
-  margin-top: -5px;
-}
-
-.panel-promo-closebutton > .toolbarbutton-text {
-  padding: 0;
-  margin: 0;
-}
-
 /* ::::: content area ::::: */
 
 #sidebar {
-- 
cgit v1.2.3


From 8fe7bfe0653d1578267499e56d562a8f5e54ee8d Mon Sep 17 00:00:00 2001
From: JustOff <Off.Just.Off@gmail.com>
Date: Mon, 16 Apr 2018 19:24:21 +0300
Subject: Remove Sync promobox from popup-notifications.inc as well

---
 application/palemoon/base/content/popup-notifications.inc | 1 -
 1 file changed, 1 deletion(-)

(limited to 'application/palemoon')

diff --git a/application/palemoon/base/content/popup-notifications.inc b/application/palemoon/base/content/popup-notifications.inc
index 7be975b7f..31a72b489 100644
--- a/application/palemoon/base/content/popup-notifications.inc
+++ b/application/palemoon/base/content/popup-notifications.inc
@@ -2,7 +2,6 @@
 
     <panel id="notification-popup"
            type="arrow"
-           footertype="promobox"
            position="after_start"
            hidden="true"
            orient="vertical"
-- 
cgit v1.2.3


From 9ec630afa1bc934fd13941f214b7e30613419bd8 Mon Sep 17 00:00:00 2001
From: JustOff <Off.Just.Off@gmail.com>
Date: Mon, 16 Apr 2018 20:06:31 +0300
Subject: Remove unused Sync promotion notification icon

---
 application/palemoon/themes/linux/jar.mn                 |   1 -
 .../palemoon/themes/linux/sync-notification-24.png       | Bin 1565 -> 0 bytes
 application/palemoon/themes/osx/jar.mn                   |   1 -
 application/palemoon/themes/osx/sync-notification-24.png | Bin 1119 -> 0 bytes
 application/palemoon/themes/windows/jar.mn               |   1 -
 .../palemoon/themes/windows/sync-notification-24.png     | Bin 1119 -> 0 bytes
 6 files changed, 3 deletions(-)
 delete mode 100644 application/palemoon/themes/linux/sync-notification-24.png
 delete mode 100644 application/palemoon/themes/osx/sync-notification-24.png
 delete mode 100644 application/palemoon/themes/windows/sync-notification-24.png

(limited to 'application/palemoon')

diff --git a/application/palemoon/themes/linux/jar.mn b/application/palemoon/themes/linux/jar.mn
index 44d837778..f1339b803 100644
--- a/application/palemoon/themes/linux/jar.mn
+++ b/application/palemoon/themes/linux/jar.mn
@@ -130,7 +130,6 @@ browser.jar:
   skin/classic/browser/sync-128.png
   skin/classic/browser/sync-desktopIcon.png
   skin/classic/browser/sync-mobileIcon.png
-  skin/classic/browser/sync-notification-24.png
   skin/classic/browser/syncSetup.css
   skin/classic/browser/syncCommon.css
   skin/classic/browser/syncQuota.css
diff --git a/application/palemoon/themes/linux/sync-notification-24.png b/application/palemoon/themes/linux/sync-notification-24.png
deleted file mode 100644
index d67eb47ac..000000000
Binary files a/application/palemoon/themes/linux/sync-notification-24.png and /dev/null differ
diff --git a/application/palemoon/themes/osx/jar.mn b/application/palemoon/themes/osx/jar.mn
index 8742f1b87..904da3788 100644
--- a/application/palemoon/themes/osx/jar.mn
+++ b/application/palemoon/themes/osx/jar.mn
@@ -163,7 +163,6 @@ browser.jar:
         skin/classic/browser/sync-bg.png
         skin/classic/browser/sync-desktopIcon.png
         skin/classic/browser/sync-mobileIcon.png
-        skin/classic/browser/sync-notification-24.png
         skin/classic/browser/syncSetup.css
         skin/classic/browser/syncCommon.css
         skin/classic/browser/syncQuota.css
diff --git a/application/palemoon/themes/osx/sync-notification-24.png b/application/palemoon/themes/osx/sync-notification-24.png
deleted file mode 100644
index fc9a4e63d..000000000
Binary files a/application/palemoon/themes/osx/sync-notification-24.png and /dev/null differ
diff --git a/application/palemoon/themes/windows/jar.mn b/application/palemoon/themes/windows/jar.mn
index 994e87be3..30643570b 100644
--- a/application/palemoon/themes/windows/jar.mn
+++ b/application/palemoon/themes/windows/jar.mn
@@ -159,7 +159,6 @@ browser.jar:
         skin/classic/browser/sync-bg.png
         skin/classic/browser/sync-desktopIcon.png
         skin/classic/browser/sync-mobileIcon.png
-        skin/classic/browser/sync-notification-24.png
         skin/classic/browser/syncSetup.css
         skin/classic/browser/syncCommon.css
         skin/classic/browser/syncQuota.css
diff --git a/application/palemoon/themes/windows/sync-notification-24.png b/application/palemoon/themes/windows/sync-notification-24.png
deleted file mode 100644
index fc9a4e63d..000000000
Binary files a/application/palemoon/themes/windows/sync-notification-24.png and /dev/null differ
-- 
cgit v1.2.3


From 532de8c09d10767960cdecbb4fcaa4262884016e Mon Sep 17 00:00:00 2001
From: "Matt A. Tobin" <email@mattatobin.com>
Date: Mon, 16 Apr 2018 16:26:11 -0400
Subject: [PALEMOON] Source nsPlacesAutoComplete from the suite

---
 application/palemoon/base/content/tabbrowser.xml   |    2 +-
 application/palemoon/components/places/moz.build   |    5 +
 .../components/places/nsPlacesAutoComplete.js      | 1369 ++++++++++++++++++++
 .../places/nsPlacesAutoComplete.manifest           |    3 +
 4 files changed, 1378 insertions(+), 1 deletion(-)
 create mode 100644 application/palemoon/components/places/nsPlacesAutoComplete.js
 create mode 100644 application/palemoon/components/places/nsPlacesAutoComplete.manifest

(limited to 'application/palemoon')

diff --git a/application/palemoon/base/content/tabbrowser.xml b/application/palemoon/base/content/tabbrowser.xml
index eaf3ea4d9..a7cc6deea 100644
--- a/application/palemoon/base/content/tabbrowser.xml
+++ b/application/palemoon/base/content/tabbrowser.xml
@@ -73,7 +73,7 @@
                   .getService(Components.interfaces.nsIFaviconService);
       </field>
       <field name="_placesAutocomplete" readonly="true">
-         Components.classes["@mozilla.org/autocomplete/search;1?name=unifiedcomplete"]
+         Components.classes["@mozilla.org/autocomplete/search;1?name=history"]
                    .getService(Components.interfaces.mozIPlacesAutoComplete);
       </field>
       <field name="mTabBox" readonly="true">
diff --git a/application/palemoon/components/places/moz.build b/application/palemoon/components/places/moz.build
index 2e35e1951..0df5c5172 100644
--- a/application/palemoon/components/places/moz.build
+++ b/application/palemoon/components/places/moz.build
@@ -6,5 +6,10 @@
 
 JAR_MANIFESTS += ['jar.mn']
 
+EXTRA_COMPONENTS += [
+    'nsPlacesAutoComplete.js',
+    'nsPlacesAutoComplete.manifest',
+]
+
 EXTRA_JS_MODULES += [ 'PlacesUIUtils.jsm' ]
 
diff --git a/application/palemoon/components/places/nsPlacesAutoComplete.js b/application/palemoon/components/places/nsPlacesAutoComplete.js
new file mode 100644
index 000000000..681a2aea1
--- /dev/null
+++ b/application/palemoon/components/places/nsPlacesAutoComplete.js
@@ -0,0 +1,1369 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*-
+ * vim: sw=2 ts=2 sts=2 expandtab
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
+Components.utils.import("resource://gre/modules/Services.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "PlacesUtils",
+                                  "resource://gre/modules/PlacesUtils.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "TelemetryStopwatch",
+                                  "resource://gre/modules/TelemetryStopwatch.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "NetUtil",
+                                  "resource://gre/modules/NetUtil.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "Task",
+                                  "resource://gre/modules/Task.jsm");
+
+////////////////////////////////////////////////////////////////////////////////
+//// Constants
+
+const Cc = Components.classes;
+const Ci = Components.interfaces;
+const Cr = Components.results;
+
+// This SQL query fragment provides the following:
+//   - whether the entry is bookmarked (kQueryIndexBookmarked)
+//   - the bookmark title, if it is a bookmark (kQueryIndexBookmarkTitle)
+//   - the tags associated with a bookmarked entry (kQueryIndexTags)
+const kBookTagSQLFragment =
+  `EXISTS(SELECT 1 FROM moz_bookmarks WHERE fk = h.id) AS bookmarked,
+   (
+     SELECT title FROM moz_bookmarks WHERE fk = h.id AND title NOTNULL
+     ORDER BY lastModified DESC LIMIT 1
+   ) AS btitle,
+   (
+     SELECT GROUP_CONCAT(t.title, ',')
+     FROM moz_bookmarks b
+     JOIN moz_bookmarks t ON t.id = +b.parent AND t.parent = :parent
+     WHERE b.fk = h.id
+   ) AS tags`;
+
+// observer topics
+const kTopicShutdown = "places-shutdown";
+const kPrefChanged = "nsPref:changed";
+
+// Match type constants.  These indicate what type of search function we should
+// be using.
+const MATCH_ANYWHERE = Ci.mozIPlacesAutoComplete.MATCH_ANYWHERE;
+const MATCH_BOUNDARY_ANYWHERE = Ci.mozIPlacesAutoComplete.MATCH_BOUNDARY_ANYWHERE;
+const MATCH_BOUNDARY = Ci.mozIPlacesAutoComplete.MATCH_BOUNDARY;
+const MATCH_BEGINNING = Ci.mozIPlacesAutoComplete.MATCH_BEGINNING;
+const MATCH_BEGINNING_CASE_SENSITIVE = Ci.mozIPlacesAutoComplete.MATCH_BEGINNING_CASE_SENSITIVE;
+
+// AutoComplete index constants.  All AutoComplete queries will provide these
+// columns in this order.
+const kQueryIndexURL = 0;
+const kQueryIndexTitle = 1;
+const kQueryIndexFaviconURL = 2;
+const kQueryIndexBookmarked = 3;
+const kQueryIndexBookmarkTitle = 4;
+const kQueryIndexTags = 5;
+const kQueryIndexVisitCount = 6;
+const kQueryIndexTyped = 7;
+const kQueryIndexPlaceId = 8;
+const kQueryIndexQueryType = 9;
+const kQueryIndexOpenPageCount = 10;
+
+// AutoComplete query type constants.  Describes the various types of queries
+// that we can process.
+const kQueryTypeKeyword = 0;
+const kQueryTypeFiltered = 1;
+
+// This separator is used as an RTL-friendly way to split the title and tags.
+// It can also be used by an nsIAutoCompleteResult consumer to re-split the
+// "comment" back into the title and the tag.
+const kTitleTagsSeparator = " \u2013 ";
+
+const kBrowserUrlbarBranch = "browser.urlbar.";
+// Toggle autocomplete.
+const kBrowserUrlbarAutocompleteEnabledPref = "autocomplete.enabled";
+
+////////////////////////////////////////////////////////////////////////////////
+//// Globals
+
+XPCOMUtils.defineLazyServiceGetter(this, "gTextURIService",
+                                   "@mozilla.org/intl/texttosuburi;1",
+                                   "nsITextToSubURI");
+
+////////////////////////////////////////////////////////////////////////////////
+//// Helpers
+
+/**
+ * Initializes our temporary table on a given database.
+ *
+ * @param aDatabase
+ *        The mozIStorageConnection to set up the temp table on.
+ */
+function initTempTable(aDatabase)
+{
+  // Note: this should be kept up-to-date with the definition in
+  //       nsPlacesTables.h.
+  let stmt = aDatabase.createAsyncStatement(
+    `CREATE TEMP TABLE moz_openpages_temp (
+       url TEXT PRIMARY KEY
+     , open_count INTEGER
+     )`
+  );
+  stmt.executeAsync();
+  stmt.finalize();
+
+  // Note: this should be kept up-to-date with the definition in
+  //       nsPlacesTriggers.h.
+  stmt = aDatabase.createAsyncStatement(
+    `CREATE TEMPORARY TRIGGER moz_openpages_temp_afterupdate_trigger
+     AFTER UPDATE OF open_count ON moz_openpages_temp FOR EACH ROW
+     WHEN NEW.open_count = 0
+     BEGIN
+       DELETE FROM moz_openpages_temp
+       WHERE url = NEW.url;
+     END`
+  );
+  stmt.executeAsync();
+  stmt.finalize();
+}
+
+/**
+ * Used to unescape encoded URI strings, and drop information that we do not
+ * care about for searching.
+ *
+ * @param aURIString
+ *        The text to unescape and modify.
+ * @return the modified uri.
+ */
+function fixupSearchText(aURIString)
+{
+  let uri = stripPrefix(aURIString);
+  return gTextURIService.unEscapeURIForUI("UTF-8", uri);
+}
+
+/**
+ * Strip prefixes from the URI that we don't care about for searching.
+ *
+ * @param aURIString
+ *        The text to modify.
+ * @return the modified uri.
+ */
+function stripPrefix(aURIString)
+{
+  let uri = aURIString;
+
+  if (uri.indexOf("http://") == 0) {
+    uri = uri.slice(7);
+  }
+  else if (uri.indexOf("https://") == 0) {
+    uri = uri.slice(8);
+  }
+  else if (uri.indexOf("ftp://") == 0) {
+    uri = uri.slice(6);
+  }
+
+  if (uri.indexOf("www.") == 0) {
+    uri = uri.slice(4);
+  }
+  return uri;
+}
+
+/**
+ * safePrefGetter get the pref with type safety.
+ * This will return the default value provided if no pref is set.
+ *
+ * @param aPrefBranch
+ *        The nsIPrefBranch containing the required preference
+ * @param aName
+ *        A preference name
+ * @param aDefault
+ *        The preference's default value
+ * @return the preference value or provided default
+ */
+
+function safePrefGetter(aPrefBranch, aName, aDefault) {
+  let types = {
+    boolean: "Bool",
+    number: "Int",
+    string: "Char"
+  };
+  let type = types[typeof(aDefault)];
+  if (!type) {
+    throw "Unknown type!";
+  }
+
+  // If the pref isn't set, we want to use the default.
+  if (aPrefBranch.getPrefType(aName) == Ci.nsIPrefBranch.PREF_INVALID) {
+    return aDefault;
+  }
+  try {
+    return aPrefBranch["get" + type + "Pref"](aName);
+  }
+  catch (e) {
+    return aDefault;
+  }
+}
+
+/**
+ * Whether UnifiedComplete is alive.
+ */
+function isUnifiedCompleteInstantiated() {
+  try {
+    return Components.manager.QueryInterface(Ci.nsIServiceManager)
+                     .isServiceInstantiated(Cc["@mozilla.org/autocomplete/search;1?name=unifiedcomplete"],
+                                            Ci.mozIPlacesAutoComplete);
+  } catch (ex) {
+    return false;
+  }
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//// AutoCompleteStatementCallbackWrapper class
+
+/**
+ * Wraps a callback and ensures that handleCompletion is not dispatched if the
+ * query is no longer tracked.
+ *
+ * @param aAutocomplete
+ *        A reference to a nsPlacesAutoComplete.
+ * @param aCallback
+ *        A reference to a mozIStorageStatementCallback
+ * @param aDBConnection
+ *        The database connection to execute the queries on.
+ */
+function AutoCompleteStatementCallbackWrapper(aAutocomplete, aCallback,
+                                              aDBConnection)
+{
+  this._autocomplete = aAutocomplete;
+  this._callback = aCallback;
+  this._db = aDBConnection;
+}
+
+AutoCompleteStatementCallbackWrapper.prototype = {
+  //////////////////////////////////////////////////////////////////////////////
+  //// mozIStorageStatementCallback
+
+  handleResult: function ACSCW_handleResult(aResultSet)
+  {
+    this._callback.handleResult.apply(this._callback, arguments);
+  },
+
+  handleError: function ACSCW_handleError(aError)
+  {
+    this._callback.handleError.apply(this._callback, arguments);
+  },
+
+  handleCompletion: function ACSCW_handleCompletion(aReason)
+  {
+    // Only dispatch handleCompletion if we are not done searching and are a
+    // pending search.
+    if (!this._autocomplete.isSearchComplete() &&
+        this._autocomplete.isPendingSearch(this._handle)) {
+      this._callback.handleCompletion.apply(this._callback, arguments);
+    }
+  },
+
+  //////////////////////////////////////////////////////////////////////////////
+  //// AutoCompleteStatementCallbackWrapper
+
+  /**
+   * Executes the specified query asynchronously.  This object will notify
+   * this._callback if we should notify (logic explained in handleCompletion).
+   *
+   * @param aQueries
+   *        The queries to execute asynchronously.
+   * @return a mozIStoragePendingStatement that can be used to cancel the
+   *         queries.
+   */
+  executeAsync: function ACSCW_executeAsync(aQueries)
+  {
+    return this._handle = this._db.executeAsync(aQueries, aQueries.length,
+                                                this);
+  },
+
+  //////////////////////////////////////////////////////////////////////////////
+  //// nsISupports
+
+  QueryInterface: XPCOMUtils.generateQI([
+    Ci.mozIStorageStatementCallback,
+  ])
+};
+
+////////////////////////////////////////////////////////////////////////////////
+//// nsPlacesAutoComplete class
+//// @mozilla.org/autocomplete/search;1?name=history
+
+function nsPlacesAutoComplete()
+{
+  //////////////////////////////////////////////////////////////////////////////
+  //// Shared Constants for Smart Getters
+
+  // TODO bug 412736 in case of a frecency tie, break it with h.typed and
+  // h.visit_count which is better than nothing.  This is slow, so not doing it
+  // yet...
+  function baseQuery(conditions = "") {
+    let query = `SELECT h.url, h.title, f.url, ${kBookTagSQLFragment},
+                        h.visit_count, h.typed, h.id, :query_type,
+                        t.open_count
+                 FROM moz_places h
+                 LEFT JOIN moz_favicons f ON f.id = h.favicon_id
+                 LEFT JOIN moz_openpages_temp t ON t.url = h.url
+                 WHERE h.frecency <> 0
+                   AND AUTOCOMPLETE_MATCH(:searchString, h.url,
+                                          IFNULL(btitle, h.title), tags,
+                                          h.visit_count, h.typed,
+                                          bookmarked, t.open_count,
+                                          :matchBehavior, :searchBehavior)
+                 ${conditions}
+                 ORDER BY h.frecency DESC, h.id DESC
+                 LIMIT :maxResults`;
+    return query;
+  }
+
+  //////////////////////////////////////////////////////////////////////////////
+  //// Smart Getters
+
+  XPCOMUtils.defineLazyGetter(this, "_db", function() {
+    // Get a cloned, read-only version of the database.  We'll only ever write
+    // to our own in-memory temp table, and having a cloned copy means we do not
+    // run the risk of our queries taking longer due to the main database
+    // connection performing a long-running task.
+    let db = PlacesUtils.history.DBConnection.clone(true);
+
+    // Autocomplete often fallbacks to a table scan due to lack of text indices.
+    // In such cases a larger cache helps reducing IO.  The default Storage
+    // value is MAX_CACHE_SIZE_BYTES in storage/mozStorageConnection.cpp.
+    let stmt = db.createAsyncStatement("PRAGMA cache_size = -6144"); // 6MiB
+    stmt.executeAsync();
+    stmt.finalize();
+
+    // Create our in-memory tables for tab tracking.
+    initTempTable(db);
+
+    // Populate the table with current open pages cache contents.
+    if (this._openPagesCache.length > 0) {
+      // Avoid getter re-entrance from the _registerOpenPageQuery lazy getter.
+      let stmt = this._registerOpenPageQuery =
+        db.createAsyncStatement(this._registerOpenPageQuerySQL);
+      let params = stmt.newBindingParamsArray();
+      for (let i = 0; i < this._openPagesCache.length; i++) {
+        let bp = params.newBindingParams();
+        bp.bindByName("page_url", this._openPagesCache[i]);
+        params.addParams(bp);
+      }
+      stmt.bindParameters(params);
+      stmt.executeAsync();
+      stmt.finalize();
+      delete this._openPagesCache;
+    }
+
+    return db;
+  });
+
+  this._customQuery = (conditions = "") => {
+    return this._db.createAsyncStatement(baseQuery(conditions));
+  };
+
+  XPCOMUtils.defineLazyGetter(this, "_defaultQuery", function() {
+    return this._db.createAsyncStatement(baseQuery());
+  });
+
+  XPCOMUtils.defineLazyGetter(this, "_historyQuery", function() {
+    // Enforce ignoring the visit_count index, since the frecency one is much
+    // faster in this case.  ANALYZE helps the query planner to figure out the
+    // faster path, but it may not have run yet.
+    return this._db.createAsyncStatement(baseQuery("AND +h.visit_count > 0"));
+  });
+
+  XPCOMUtils.defineLazyGetter(this, "_bookmarkQuery", function() {
+    return this._db.createAsyncStatement(baseQuery("AND bookmarked"));
+  });
+
+  XPCOMUtils.defineLazyGetter(this, "_tagsQuery", function() {
+    return this._db.createAsyncStatement(baseQuery("AND tags IS NOT NULL"));
+  });
+
+  XPCOMUtils.defineLazyGetter(this, "_openPagesQuery", function() {
+    return this._db.createAsyncStatement(
+      `SELECT t.url, t.url, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+              :query_type, t.open_count, NULL
+       FROM moz_openpages_temp t
+       LEFT JOIN moz_places h ON h.url = t.url
+       WHERE h.id IS NULL
+         AND AUTOCOMPLETE_MATCH(:searchString, t.url, t.url, NULL,
+                                NULL, NULL, NULL, t.open_count,
+                                :matchBehavior, :searchBehavior)
+       ORDER BY t.ROWID DESC
+       LIMIT :maxResults`
+    );
+  });
+
+  XPCOMUtils.defineLazyGetter(this, "_typedQuery", function() {
+    return this._db.createAsyncStatement(baseQuery("AND h.typed = 1"));
+  });
+
+  XPCOMUtils.defineLazyGetter(this, "_adaptiveQuery", function() {
+    return this._db.createAsyncStatement(
+      `/* do not warn (bug 487789) */
+       SELECT h.url, h.title, f.url, ${kBookTagSQLFragment},
+              h.visit_count, h.typed, h.id, :query_type, t.open_count
+       FROM (
+       SELECT ROUND(
+           MAX(use_count) * (1 + (input = :search_string)), 1
+         ) AS rank, place_id
+         FROM moz_inputhistory
+         WHERE input BETWEEN :search_string AND :search_string || X'FFFF'
+         GROUP BY place_id
+       ) AS i
+       JOIN moz_places h ON h.id = i.place_id
+       LEFT JOIN moz_favicons f ON f.id = h.favicon_id
+       LEFT JOIN moz_openpages_temp t ON t.url = h.url
+       WHERE AUTOCOMPLETE_MATCH(NULL, h.url,
+                                IFNULL(btitle, h.title), tags,
+                                h.visit_count, h.typed, bookmarked,
+                                t.open_count,
+                                :matchBehavior, :searchBehavior)
+       ORDER BY rank DESC, h.frecency DESC`
+    );
+  });
+
+  XPCOMUtils.defineLazyGetter(this, "_keywordQuery", function() {
+    return this._db.createAsyncStatement(
+      `/* do not warn (bug 487787) */
+       SELECT REPLACE(h.url, '%s', :query_string) AS search_url, h.title,
+       IFNULL(f.url, (SELECT f.url
+                      FROM moz_places
+                      JOIN moz_favicons f ON f.id = favicon_id
+                      WHERE rev_host = h.rev_host
+                      ORDER BY frecency DESC
+                      LIMIT 1)
+       ), 1, NULL, NULL, h.visit_count, h.typed, h.id,
+       :query_type, t.open_count
+       FROM moz_keywords k
+       JOIN moz_places h ON k.place_id = h.id
+       LEFT JOIN moz_favicons f ON f.id = h.favicon_id
+       LEFT JOIN moz_openpages_temp t ON t.url = search_url
+       WHERE k.keyword = LOWER(:keyword)`
+    );
+  });
+
+  this._registerOpenPageQuerySQL =
+    `INSERT OR REPLACE INTO moz_openpages_temp (url, open_count)
+       VALUES (:page_url,
+         IFNULL(
+           (
+             SELECT open_count + 1
+             FROM moz_openpages_temp
+             WHERE url = :page_url
+           ),
+           1
+         )
+       )`;
+  XPCOMUtils.defineLazyGetter(this, "_registerOpenPageQuery", function() {
+    return this._db.createAsyncStatement(this._registerOpenPageQuerySQL);
+  });
+
+  XPCOMUtils.defineLazyGetter(this, "_unregisterOpenPageQuery", function() {
+    return this._db.createAsyncStatement(
+      `UPDATE moz_openpages_temp
+       SET open_count = open_count - 1
+       WHERE url = :page_url`
+    );
+  });
+
+  //////////////////////////////////////////////////////////////////////////////
+  //// Initialization
+
+  // load preferences
+  this._prefs = Cc["@mozilla.org/preferences-service;1"].
+                getService(Ci.nsIPrefService).
+                getBranch(kBrowserUrlbarBranch);
+  this._syncEnabledPref();
+  this._loadPrefs(true);
+
+  // register observers
+  this._os = Cc["@mozilla.org/observer-service;1"].
+              getService(Ci.nsIObserverService);
+  this._os.addObserver(this, kTopicShutdown, false);
+
+}
+
+nsPlacesAutoComplete.prototype = {
+  //////////////////////////////////////////////////////////////////////////////
+  //// nsIAutoCompleteSearch
+
+  startSearch: function PAC_startSearch(aSearchString, aSearchParam,
+                                        aPreviousResult, aListener)
+  {
+    // Stop the search in case the controller has not taken care of it.
+    this.stopSearch();
+
+    // Note: We don't use aPreviousResult to make sure ordering of results are
+    //       consistent.  See bug 412730 for more details.
+
+    // We want to store the original string with no leading or trailing
+    // whitespace for case sensitive searches.
+    this._originalSearchString = aSearchString.trim();
+
+    this._currentSearchString =
+      fixupSearchText(this._originalSearchString.toLowerCase());
+
+    let params = new Set(aSearchParam.split(" "));
+    this._enableActions = params.has("enable-actions");
+    this._disablePrivateActions = params.has("disable-private-actions");
+
+    this._listener = aListener;
+    let result = Cc["@mozilla.org/autocomplete/simple-result;1"].
+                 createInstance(Ci.nsIAutoCompleteSimpleResult);
+    result.setSearchString(aSearchString);
+    result.setListener(this);
+    this._result = result;
+
+    // If we are not enabled, we need to return now.
+    if (!this._enabled) {
+      this._finishSearch(true);
+      return;
+    }
+
+    // Reset our search behavior to the default.
+    if (this._currentSearchString) {
+      this._behavior = this._defaultBehavior;
+    }
+    else {
+      this._behavior = this._emptySearchDefaultBehavior;
+    }
+    // For any given search, we run up to four queries:
+    // 1) keywords (this._keywordQuery)
+    // 2) adaptive learning (this._adaptiveQuery)
+    // 3) open pages not supported by history (this._openPagesQuery)
+    // 4) query from this._getSearch
+    // (1) only gets ran if we get any filtered tokens from this._getSearch,
+    // since if there are no tokens, there is nothing to match, so there is no
+    // reason to run the query).
+    let {query, tokens} =
+      this._getSearch(this._getUnfilteredSearchTokens(this._currentSearchString));
+    let queries = tokens.length ?
+      [this._getBoundKeywordQuery(tokens), this._getBoundAdaptiveQuery()] :
+      [this._getBoundAdaptiveQuery()];
+
+    if (this._hasBehavior("openpage")) {
+      queries.push(this._getBoundOpenPagesQuery(tokens));
+    }
+    queries.push(query);
+
+    // Start executing our queries.
+    this._telemetryStartTime = Date.now();
+    this._executeQueries(queries);
+
+    // Set up our persistent state for the duration of the search.
+    this._searchTokens = tokens;
+    this._usedPlaces = {};
+  },
+
+  stopSearch: function PAC_stopSearch()
+  {
+    // We need to cancel our searches so we do not get any [more] results.
+    // However, it's possible we haven't actually started any searches, so this
+    // method may throw because this._pendingQuery may be undefined.
+    if (this._pendingQuery) {
+      this._stopActiveQuery();
+    }
+
+    this._finishSearch(false);
+  },
+
+  //////////////////////////////////////////////////////////////////////////////
+  //// nsIAutoCompleteSimpleResultListener
+
+  onValueRemoved: function PAC_onValueRemoved(aResult, aURISpec, aRemoveFromDB)
+  {
+    if (aRemoveFromDB) {
+      PlacesUtils.history.removePage(NetUtil.newURI(aURISpec));
+    }
+  },
+
+  //////////////////////////////////////////////////////////////////////////////
+  //// mozIPlacesAutoComplete
+
+  // If the connection has not yet been started, use this local cache.  This
+  // prevents autocomplete from initing the database till the first search.
+  _openPagesCache: [],
+  registerOpenPage: function PAC_registerOpenPage(aURI)
+  {
+    if (!this._databaseInitialized) {
+      this._openPagesCache.push(aURI.spec);
+      return;
+    }
+
+    let stmt = this._registerOpenPageQuery;
+    stmt.params.page_url = aURI.spec;
+    stmt.executeAsync();
+  },
+
+  unregisterOpenPage: function PAC_unregisterOpenPage(aURI)
+  {
+    if (!this._databaseInitialized) {
+      let index = this._openPagesCache.indexOf(aURI.spec);
+      if (index != -1) {
+        this._openPagesCache.splice(index, 1);
+      }
+      return;
+    }
+
+    let stmt = this._unregisterOpenPageQuery;
+    stmt.params.page_url = aURI.spec;
+    stmt.executeAsync();
+  },
+
+  //////////////////////////////////////////////////////////////////////////////
+  //// mozIStorageStatementCallback
+
+  handleResult: function PAC_handleResult(aResultSet)
+  {
+    let row, haveMatches = false;
+    while ((row = aResultSet.getNextRow())) {
+      let match = this._processRow(row);
+      haveMatches = haveMatches || match;
+
+      if (this._result.matchCount == this._maxRichResults) {
+        // We have enough results, so stop running our search.
+        this._stopActiveQuery();
+
+        // And finish our search.
+        this._finishSearch(true);
+        return;
+      }
+
+    }
+
+    // Notify about results if we've gotten them.
+    if (haveMatches) {
+      this._notifyResults(true);
+    }
+  },
+
+  handleError: function PAC_handleError(aError)
+  {
+    Components.utils.reportError("Places AutoComplete: An async statement encountered an " +
+                                 "error: " + aError.result + ", '" + aError.message + "'");
+  },
+
+  handleCompletion: function PAC_handleCompletion(aReason)
+  {
+    // If we have already finished our search, we should bail out early.
+    if (this.isSearchComplete()) {
+      return;
+    }
+
+    // If we do not have enough results, and our match type is
+    // MATCH_BOUNDARY_ANYWHERE, search again with MATCH_ANYWHERE to get more
+    // results.
+    if (this._matchBehavior == MATCH_BOUNDARY_ANYWHERE &&
+        this._result.matchCount < this._maxRichResults && !this._secondPass) {
+      this._secondPass = true;
+      let queries = [
+        this._getBoundAdaptiveQuery(MATCH_ANYWHERE),
+        this._getBoundSearchQuery(MATCH_ANYWHERE, this._searchTokens),
+      ];
+      this._executeQueries(queries);
+      return;
+    }
+
+    this._finishSearch(true);
+  },
+
+  //////////////////////////////////////////////////////////////////////////////
+  //// nsIObserver
+
+  observe: function PAC_observe(aSubject, aTopic, aData)
+  {
+    if (aTopic == kTopicShutdown) {
+      this._os.removeObserver(this, kTopicShutdown);
+
+      // Remove our preference observer.
+      this._prefs.removeObserver("", this);
+      delete this._prefs;
+
+      // Finalize the statements that we have used.
+      let stmts = [
+        "_defaultQuery",
+        "_historyQuery",
+        "_bookmarkQuery",
+        "_tagsQuery",
+        "_openPagesQuery",
+        "_typedQuery",
+        "_adaptiveQuery",
+        "_keywordQuery",
+        "_registerOpenPageQuery",
+        "_unregisterOpenPageQuery",
+      ];
+      for (let i = 0; i < stmts.length; i++) {
+        // We do not want to create any query we haven't already created, so
+        // see if it is a getter first.
+        if (Object.getOwnPropertyDescriptor(this, stmts[i]).value !== undefined) {
+          this[stmts[i]].finalize();
+        }
+      }
+
+      if (this._databaseInitialized) {
+        this._db.asyncClose();
+      }
+    }
+    else if (aTopic == kPrefChanged) {
+      // Avoid re-entrancy when flipping linked preferences.
+      if (this._ignoreNotifications)
+        return;
+      this._ignoreNotifications = true;
+      this._loadPrefs(false, aTopic, aData);
+      this._ignoreNotifications = false;
+    }
+  },
+
+  //////////////////////////////////////////////////////////////////////////////
+  //// nsPlacesAutoComplete
+
+  get _databaseInitialized() {
+    return Object.getOwnPropertyDescriptor(this, "_db").value !== undefined;
+  },
+
+  /**
+   * Generates the tokens used in searching from a given string.
+   *
+   * @param aSearchString
+   *        The string to generate tokens from.
+   * @return an array of tokens.
+   */
+  _getUnfilteredSearchTokens: function PAC_unfilteredSearchTokens(aSearchString)
+  {
+    // Calling split on an empty string will return an array containing one
+    // empty string.  We don't want that, as it'll break our logic, so return an
+    // empty array then.
+    return aSearchString.length ? aSearchString.split(" ") : [];
+  },
+
+  /**
+   * Properly cleans up when searching is completed.
+   *
+   * @param aNotify
+   *        Indicates if we should notify the AutoComplete listener about our
+   *        results or not.
+   */
+  _finishSearch: function PAC_finishSearch(aNotify)
+  {
+    // Notify about results if we are supposed to.
+    if (aNotify) {
+      this._notifyResults(false);
+    }
+
+    // Clear our state
+    delete this._originalSearchString;
+    delete this._currentSearchString;
+    delete this._strippedPrefix;
+    delete this._searchTokens;
+    delete this._listener;
+    delete this._result;
+    delete this._usedPlaces;
+    delete this._pendingQuery;
+    this._secondPass = false;
+    this._enableActions = false;
+  },
+
+  /**
+   * Executes the given queries asynchronously.
+   *
+   * @param aQueries
+   *        The queries to execute.
+   */
+  _executeQueries: function PAC_executeQueries(aQueries)
+  {
+    // Because we might get a handleCompletion for canceled queries, we want to
+    // filter out queries we no longer care about (described in the
+    // handleCompletion implementation of AutoCompleteStatementCallbackWrapper).
+
+    // Create our wrapper object and execute the queries.
+    let wrapper = new AutoCompleteStatementCallbackWrapper(this, this, this._db);
+    this._pendingQuery = wrapper.executeAsync(aQueries);
+  },
+
+  /**
+   * Stops executing our active query.
+   */
+  _stopActiveQuery: function PAC_stopActiveQuery()
+  {
+    this._pendingQuery.cancel();
+    delete this._pendingQuery;
+  },
+
+  /**
+   * Notifies the listener about results.
+   *
+   * @param aSearchOngoing
+   *        Indicates if the search is ongoing or not.
+   */
+  _notifyResults: function PAC_notifyResults(aSearchOngoing)
+  {
+    let result = this._result;
+    let resultCode = result.matchCount ? "RESULT_SUCCESS" : "RESULT_NOMATCH";
+    if (aSearchOngoing) {
+      resultCode += "_ONGOING";
+    }
+    result.setSearchResult(Ci.nsIAutoCompleteResult[resultCode]);
+    this._listener.onSearchResult(this, result);
+    if (this._telemetryStartTime) {
+      let elapsed = Date.now() - this._telemetryStartTime;
+      if (elapsed > 50) {
+        try {
+          Services.telemetry
+                  .getHistogramById("PLACES_AUTOCOMPLETE_1ST_RESULT_TIME_MS")
+                  .add(elapsed);
+        } catch (ex) {
+          Components.utils.reportError("Unable to report telemetry.");
+        }
+      }
+      this._telemetryStartTime = null;
+    }
+  },
+
+  /**
+   * Synchronize suggest.* prefs with autocomplete.enabled.
+   */
+  _syncEnabledPref: function PAC_syncEnabledPref()
+  {
+    let suggestPrefs = ["suggest.history", "suggest.bookmark", "suggest.openpage"];
+    let types = ["History", "Bookmark", "Openpage"];
+
+    this._enabled = safePrefGetter(this._prefs, kBrowserUrlbarAutocompleteEnabledPref,
+                                   true);
+    this._suggestHistory = safePrefGetter(this._prefs, "suggest.history", true);
+    this._suggestBookmark = safePrefGetter(this._prefs, "suggest.bookmark", true);
+    this._suggestOpenpage = safePrefGetter(this._prefs, "suggest.openpage", true);
+
+    if (this._enabled) {
+      // If the autocomplete preference is active, activate all suggest
+      // preferences only if all of them are false.
+      if (types.every(type => this["_suggest" + type] == false)) {
+        for (let type of suggestPrefs) {
+          this._prefs.setBoolPref(type, true);
+        }
+      }
+    } else {
+      // If the preference was deactivated, deactivate all suggest preferences.
+      for (let type of suggestPrefs) {
+        this._prefs.setBoolPref(type, false);
+      }
+    }
+  },
+
+  /**
+   * Loads the preferences that we care about.
+   *
+   * @param [optional] aRegisterObserver
+   *        Indicates if the preference observer should be added or not.  The
+   *        default value is false.
+   * @param [optional] aTopic
+   *        Observer's topic, if any.
+   * @param [optional] aSubject
+   *        Observer's subject, if any.
+   */
+  _loadPrefs: function PAC_loadPrefs(aRegisterObserver, aTopic, aData)
+  {
+    // Avoid race conditions with UnifiedComplete component.
+    if (aData && !isUnifiedCompleteInstantiated()) {
+      // Synchronize suggest.* prefs with autocomplete.enabled.
+      if (aData == kBrowserUrlbarAutocompleteEnabledPref) {
+        this._syncEnabledPref();
+      } else if (aData.startsWith("suggest.")) {
+        let suggestPrefs = ["suggest.history", "suggest.bookmark", "suggest.openpage"];
+        this._prefs.setBoolPref(kBrowserUrlbarAutocompleteEnabledPref,
+                                suggestPrefs.some(pref => safePrefGetter(this._prefs, pref, true)));
+      }
+    }
+
+    this._enabled = safePrefGetter(this._prefs,
+                                   kBrowserUrlbarAutocompleteEnabledPref,
+                                   true);
+    this._matchBehavior = safePrefGetter(this._prefs,
+                                         "matchBehavior",
+                                         MATCH_BOUNDARY_ANYWHERE);
+    this._filterJavaScript = safePrefGetter(this._prefs, "filter.javascript", true);
+    this._maxRichResults = safePrefGetter(this._prefs, "maxRichResults", 25);
+    this._restrictHistoryToken = safePrefGetter(this._prefs,
+                                                "restrict.history", "^");
+    this._restrictBookmarkToken = safePrefGetter(this._prefs,
+                                                 "restrict.bookmark", "*");
+    this._restrictTypedToken = safePrefGetter(this._prefs, "restrict.typed", "~");
+    this._restrictTagToken = safePrefGetter(this._prefs, "restrict.tag", "+");
+    this._restrictOpenPageToken = safePrefGetter(this._prefs,
+                                                 "restrict.openpage", "%");
+    this._matchTitleToken = safePrefGetter(this._prefs, "match.title", "#");
+    this._matchURLToken = safePrefGetter(this._prefs, "match.url", "@");
+
+    this._suggestHistory = safePrefGetter(this._prefs, "suggest.history", true);
+    this._suggestBookmark = safePrefGetter(this._prefs, "suggest.bookmark", true);
+    this._suggestOpenpage = safePrefGetter(this._prefs, "suggest.openpage", true);
+    this._suggestTyped = safePrefGetter(this._prefs, "suggest.history.onlyTyped", false);
+
+    // If history is not set, onlyTyped value should be ignored.
+    if (!this._suggestHistory) {
+      this._suggestTyped = false;
+    }
+    let types = ["History", "Bookmark", "Openpage", "Typed"];
+    this._defaultBehavior = types.reduce((memo, type) => {
+      let prefValue = this["_suggest" + type];
+      return memo | (prefValue &&
+                     Ci.mozIPlacesAutoComplete["BEHAVIOR_" + type.toUpperCase()]);
+    }, 0);
+
+    // Further restrictions to apply for "empty searches" (i.e. searches for "").
+    // The empty behavior is typed history, if history is enabled. Otherwise,
+    // it is bookmarks, if they are enabled. If both history and bookmarks are disabled,
+    // it defaults to open pages.
+    this._emptySearchDefaultBehavior = Ci.mozIPlacesAutoComplete.BEHAVIOR_RESTRICT;
+    if (this._suggestHistory) {
+      this._emptySearchDefaultBehavior |= Ci.mozIPlacesAutoComplete.BEHAVIOR_HISTORY |
+                                          Ci.mozIPlacesAutoComplete.BEHAVIOR_TYPED;
+    } else if (this._suggestBookmark) {
+      this._emptySearchDefaultBehavior |= Ci.mozIPlacesAutoComplete.BEHAVIOR_BOOKMARK;
+    } else {
+      this._emptySearchDefaultBehavior |= Ci.mozIPlacesAutoComplete.BEHAVIOR_OPENPAGE;
+    }
+
+    // Validate matchBehavior; default to MATCH_BOUNDARY_ANYWHERE.
+    if (this._matchBehavior != MATCH_ANYWHERE &&
+        this._matchBehavior != MATCH_BOUNDARY &&
+        this._matchBehavior != MATCH_BEGINNING) {
+      this._matchBehavior = MATCH_BOUNDARY_ANYWHERE;
+    }
+    // register observer
+    if (aRegisterObserver) {
+      this._prefs.addObserver("", this, false);
+    }
+  },
+
+  /**
+   * Given an array of tokens, this function determines which query should be
+   * ran.  It also removes any special search tokens.
+   *
+   * @param aTokens
+   *        An array of search tokens.
+   * @return an object with two properties:
+   *         query: the correctly optimized, bound query to search the database
+   *                with.
+   *         tokens: the filtered list of tokens to search with.
+   */
+  _getSearch: function PAC_getSearch(aTokens)
+  {
+    let foundToken = false;
+    let restrict = (behavior) => {
+      if (!foundToken) {
+        this._behavior = 0;
+        this._setBehavior("restrict");
+        foundToken = true;
+      }
+      this._setBehavior(behavior);
+    };
+
+    // Set the proper behavior so our call to _getBoundSearchQuery gives us the
+    // correct query.
+    for (let i = aTokens.length - 1; i >= 0; i--) {
+      switch (aTokens[i]) {
+        case this._restrictHistoryToken:
+          restrict("history");
+          break;
+        case this._restrictBookmarkToken:
+          restrict("bookmark");
+          break;
+        case this._restrictTagToken:
+          restrict("tag");
+          break;
+        case this._restrictOpenPageToken:
+          if (!this._enableActions) {
+            continue;
+          }
+          restrict("openpage");
+          break;
+        case this._matchTitleToken:
+          restrict("title");
+          break;
+        case this._matchURLToken:
+          restrict("url");
+          break;
+        case this._restrictTypedToken:
+          restrict("typed");
+          break;
+        default:
+          // We do not want to remove the token if we did not match.
+          continue;
+      }
+
+      aTokens.splice(i, 1);
+    }
+
+    // Set the right JavaScript behavior based on our preference.  Note that the
+    // preference is whether or not we should filter JavaScript, and the
+    // behavior is if we should search it or not.
+    if (!this._filterJavaScript) {
+      this._setBehavior("javascript");
+    }
+
+    return {
+      query: this._getBoundSearchQuery(this._matchBehavior, aTokens),
+      tokens: aTokens
+    };
+  },
+
+  /**
+   * @return a string consisting of the search query to be used based on the
+   * previously set urlbar suggestion preferences.
+   */
+  _getSuggestionPrefQuery: function PAC_getSuggestionPrefQuery()
+  {
+    if (!this._hasBehavior("restrict") && this._hasBehavior("history") &&
+        this._hasBehavior("bookmark")) {
+      return this._hasBehavior("typed") ? this._customQuery("AND h.typed = 1")
+                                        : this._defaultQuery;
+    }
+    let conditions = [];
+    if (this._hasBehavior("history")) {
+      // Enforce ignoring the visit_count index, since the frecency one is much
+      // faster in this case.  ANALYZE helps the query planner to figure out the
+      // faster path, but it may not have up-to-date information yet.
+      conditions.push("+h.visit_count > 0");
+    }
+    if (this._hasBehavior("typed")) {
+      conditions.push("h.typed = 1");
+    }
+    if (this._hasBehavior("bookmark")) {
+      conditions.push("bookmarked");
+    }
+    if (this._hasBehavior("tag")) {
+      conditions.push("tags NOTNULL");
+    }
+
+    return conditions.length ? this._customQuery("AND " + conditions.join(" AND "))
+                             : this._defaultQuery;
+  },
+
+  /**
+   * Obtains the search query to be used based on the previously set search
+   * behaviors (accessed by this._hasBehavior).  The query is bound and ready to
+   * execute.
+   *
+   * @param aMatchBehavior
+   *        How this query should match its tokens to the search string.
+   * @param aTokens
+   *        An array of search tokens.
+   * @return the correctly optimized query to search the database with and the
+   *         new list of tokens to search with.  The query has all the needed
+   *         parameters bound, so consumers can execute it without doing any
+   *         additional work.
+   */
+  _getBoundSearchQuery: function PAC_getBoundSearchQuery(aMatchBehavior,
+                                                         aTokens)
+  {
+    let query = this._getSuggestionPrefQuery();
+
+    // Bind the needed parameters to the query so consumers can use it.
+    let params = query.params;
+    params.parent = PlacesUtils.tagsFolderId;
+    params.query_type = kQueryTypeFiltered;
+    params.matchBehavior = aMatchBehavior;
+    params.searchBehavior = this._behavior;
+
+    // We only want to search the tokens that we are left with - not the
+    // original search string.
+    params.searchString = aTokens.join(" ");
+
+    // Limit the query to the the maximum number of desired results.
+    // This way we can avoid doing more work than needed.
+    params.maxResults = this._maxRichResults;
+
+    return query;
+  },
+
+  _getBoundOpenPagesQuery: function PAC_getBoundOpenPagesQuery(aTokens)
+  {
+    let query = this._openPagesQuery;
+
+    // Bind the needed parameters to the query so consumers can use it.
+    let params = query.params;
+    params.query_type = kQueryTypeFiltered;
+    params.matchBehavior = this._matchBehavior;
+    params.searchBehavior = this._behavior;
+
+    // We only want to search the tokens that we are left with - not the
+    // original search string.
+    params.searchString = aTokens.join(" ");
+    params.maxResults = this._maxRichResults;
+
+    return query;
+  },
+
+  /**
+   * Obtains the keyword query with the properly bound parameters.
+   *
+   * @param aTokens
+   *        The array of search tokens to check against.
+   * @return the bound keyword query.
+   */
+  _getBoundKeywordQuery: function PAC_getBoundKeywordQuery(aTokens)
+  {
+    // The keyword is the first word in the search string, with the parameters
+    // following it.
+    let searchString = this._originalSearchString;
+    let queryString = "";
+    let queryIndex = searchString.indexOf(" ");
+    if (queryIndex != -1) {
+      queryString = searchString.substring(queryIndex + 1);
+    }
+    // We need to escape the parameters as if they were the query in a URL
+    queryString = encodeURIComponent(queryString).replace(/%20/g, "+");
+
+    // The first word could be a keyword, so that's what we'll search.
+    let keyword = aTokens[0];
+
+    let query = this._keywordQuery;
+    let params = query.params;
+    params.keyword = keyword;
+    params.query_string = queryString;
+    params.query_type = kQueryTypeKeyword;
+
+    return query;
+  },
+
+  /**
+   * Obtains the adaptive query with the properly bound parameters.
+   *
+   * @return the bound adaptive query.
+   */
+  _getBoundAdaptiveQuery: function PAC_getBoundAdaptiveQuery(aMatchBehavior)
+  {
+    // If we were not given a match behavior, use the stored match behavior.
+    if (arguments.length == 0) {
+      aMatchBehavior = this._matchBehavior;
+    }
+
+    let query = this._adaptiveQuery;
+    let params = query.params;
+    params.parent = PlacesUtils.tagsFolderId;
+    params.search_string = this._currentSearchString;
+    params.query_type = kQueryTypeFiltered;
+    params.matchBehavior = aMatchBehavior;
+    params.searchBehavior = this._behavior;
+
+    return query;
+  },
+
+  /**
+   * Processes a mozIStorageRow to generate the proper data for the AutoComplete
+   * result.  This will add an entry to the current result if it matches the
+   * criteria.
+   *
+   * @param aRow
+   *        The row to process.
+   * @return true if the row is accepted, and false if not.
+   */
+  _processRow: function PAC_processRow(aRow)
+  {
+    // Before we do any work, make sure this entry isn't already in our results.
+    let entryId = aRow.getResultByIndex(kQueryIndexPlaceId);
+    let escapedEntryURL = aRow.getResultByIndex(kQueryIndexURL);
+    let openPageCount = aRow.getResultByIndex(kQueryIndexOpenPageCount) || 0;
+
+    // If actions are enabled and the page is open, add only the switch-to-tab
+    // result.  Otherwise, add the normal result.
+    let [url, action] = this._enableActions && openPageCount > 0 && this._hasBehavior("openpage") ?
+                        ["moz-action:switchtab," + escapedEntryURL, "action "] :
+                        [escapedEntryURL, ""];
+
+    if (this._inResults(entryId, url)) {
+      return false;
+    }
+
+    let entryTitle = aRow.getResultByIndex(kQueryIndexTitle) || "";
+    let entryFavicon = aRow.getResultByIndex(kQueryIndexFaviconURL) || "";
+    let entryBookmarked = aRow.getResultByIndex(kQueryIndexBookmarked);
+    let entryBookmarkTitle = entryBookmarked ?
+      aRow.getResultByIndex(kQueryIndexBookmarkTitle) : null;
+    let entryTags = aRow.getResultByIndex(kQueryIndexTags) || "";
+
+    // Always prefer the bookmark title unless it is empty
+    let title = entryBookmarkTitle || entryTitle;
+
+    let style;
+    if (aRow.getResultByIndex(kQueryIndexQueryType) == kQueryTypeKeyword) {
+      style = "keyword";
+      title = NetUtil.newURI(escapedEntryURL).host;
+    }
+
+    // We will always prefer to show tags if we have them.
+    let showTags = !!entryTags;
+
+    // However, we'll act as if a page is not bookmarked if the user wants
+    // only history and not bookmarks and there are no tags.
+    if (this._hasBehavior("history") && !this._hasBehavior("bookmark") &&
+        !showTags) {
+      showTags = false;
+      style = "favicon";
+    }
+
+    // If we have tags and should show them, we need to add them to the title.
+    if (showTags) {
+      title += kTitleTagsSeparator + entryTags;
+    }
+    // We have to determine the right style to display.  Tags show the tag icon,
+    // bookmarks get the bookmark icon, and keywords get the keyword icon.  If
+    // the result does not fall into any of those, it just gets the favicon.
+    if (!style) {
+      // It is possible that we already have a style set (from a keyword
+      // search or because of the user's preferences), so only set it if we
+      // haven't already done so.
+      if (showTags) {
+        style = "tag";
+      }
+      else if (entryBookmarked) {
+        style = "bookmark";
+      }
+      else {
+        style = "favicon";
+      }
+    }
+
+    this._addToResults(entryId, url, title, entryFavicon, action + style);
+    return true;
+  },
+
+  /**
+   * Checks to see if the given place has already been added to the results.
+   *
+   * @param aPlaceId
+   *        The place id to check for, may be null.
+   * @param aUrl
+   *        The url to check for.
+   * @return true if the place has been added, false otherwise.
+   *
+   * @note Must check both the id and the url for a negative match, since
+   *       autocomplete may run in the middle of a new page addition.  In such
+   *       a case the switch-to-tab query would hash the page by url, then a
+   *       next query, running after the page addition, would hash it by id.
+   *       It's not possible to just rely on url though, since keywords
+   *       dynamically modify the url to include their search string.
+   */
+  _inResults: function PAC_inResults(aPlaceId, aUrl)
+  {
+    if (aPlaceId && aPlaceId in this._usedPlaces) {
+      return true;
+    }
+    return aUrl in this._usedPlaces;
+  },
+
+  /**
+   * Adds a result to the AutoComplete results.  Also tracks that we've added
+   * this place_id into the result set.
+   *
+   * @param aPlaceId
+   *        The place_id of the item to be added to the result set.  This is
+   *        used by _inResults.
+   * @param aURISpec
+   *        The URI spec for the entry.
+   * @param aTitle
+   *        The title to give the entry.
+   * @param aFaviconSpec
+   *        The favicon to give to the entry.
+   * @param aStyle
+   *        Indicates how the entry should be styled when displayed.
+   */
+  _addToResults: function PAC_addToResults(aPlaceId, aURISpec, aTitle,
+                                           aFaviconSpec, aStyle)
+  {
+    // Add this to our internal tracker to ensure duplicates do not end up in
+    // the result.  _usedPlaces is an Object that is being used as a set.
+    // Not all entries have a place id, thus we fallback to the url for them.
+    // We cannot use only the url since keywords entries are modified to
+    // include the search string, and would be returned multiple times.  Ids
+    // are faster too.
+    this._usedPlaces[aPlaceId || aURISpec] = true;
+
+    // Obtain the favicon for this URI.
+    let favicon;
+    if (aFaviconSpec) {
+      let uri = NetUtil.newURI(aFaviconSpec);
+      favicon = PlacesUtils.favicons.getFaviconLinkForIcon(uri).spec;
+    }
+    favicon = favicon || PlacesUtils.favicons.defaultFavicon.spec;
+
+    this._result.appendMatch(aURISpec, aTitle, favicon, aStyle);
+  },
+
+  /**
+   * Determines if the specified AutoComplete behavior is set.
+   *
+   * @param aType
+   *        The behavior type to test for.
+   * @return true if the behavior is set, false otherwise.
+   */
+  _hasBehavior: function PAC_hasBehavior(aType)
+  {
+    let behavior = Ci.mozIPlacesAutoComplete["BEHAVIOR_" + aType.toUpperCase()];
+
+    if (this._disablePrivateActions &&
+        behavior == Ci.mozIPlacesAutoComplete.BEHAVIOR_OPENPAGE) {
+      return false;
+    }
+
+    return this._behavior & behavior;
+  },
+
+  /**
+   * Enables the desired AutoComplete behavior.
+   *
+   * @param aType
+   *        The behavior type to set.
+   */
+  _setBehavior: function PAC_setBehavior(aType)
+  {
+    this._behavior |=
+      Ci.mozIPlacesAutoComplete["BEHAVIOR_" + aType.toUpperCase()];
+  },
+
+  /**
+   * Determines if we are done searching or not.
+   *
+   * @return true if we have completed searching, false otherwise.
+   */
+  isSearchComplete: function PAC_isSearchComplete()
+  {
+    // If _pendingQuery is null, we should no longer do any work since we have
+    // already called _finishSearch.  This means we completed our search.
+    return this._pendingQuery == null;
+  },
+
+  /**
+   * Determines if the given handle of a pending statement is a pending search
+   * or not.
+   *
+   * @param aHandle
+   *        A mozIStoragePendingStatement to check and see if we are waiting for
+   *        results from it still.
+   * @return true if it is a pending query, false otherwise.
+   */
+  isPendingSearch: function PAC_isPendingSearch(aHandle)
+  {
+    return this._pendingQuery == aHandle;
+  },
+
+  //////////////////////////////////////////////////////////////////////////////
+  //// nsISupports
+
+  classID: Components.ID("d0272978-beab-4adc-a3d4-04b76acfa4e7"),
+
+  _xpcom_factory: XPCOMUtils.generateSingletonFactory(nsPlacesAutoComplete),
+
+  QueryInterface: XPCOMUtils.generateQI([
+    Ci.nsIAutoCompleteSearch,
+    Ci.nsIAutoCompleteSimpleResultListener,
+    Ci.mozIPlacesAutoComplete,
+    Ci.mozIStorageStatementCallback,
+    Ci.nsIObserver,
+    Ci.nsISupportsWeakReference,
+  ])
+};
+
+var components = [nsPlacesAutoComplete];
+this.NSGetFactory = XPCOMUtils.generateNSGetFactory(components);
diff --git a/application/palemoon/components/places/nsPlacesAutoComplete.manifest b/application/palemoon/components/places/nsPlacesAutoComplete.manifest
new file mode 100644
index 000000000..77dc732af
--- /dev/null
+++ b/application/palemoon/components/places/nsPlacesAutoComplete.manifest
@@ -0,0 +1,3 @@
+component {d0272978-beab-4adc-a3d4-04b76acfa4e7} nsPlacesAutoComplete.js
+contract @mozilla.org/autocomplete/search;1?name=history {d0272978-beab-4adc-a3d4-04b76acfa4e7}
+
-- 
cgit v1.2.3


From 2ccac3373fd4eaebe4fdd1812550549232fb6ed1 Mon Sep 17 00:00:00 2001
From: "Matt A. Tobin" <email@mattatobin.com>
Date: Mon, 16 Apr 2018 16:44:55 -0400
Subject: [PALEMOON] Use unified complete in autocompletesearch attribute for
 urlbar

---
 application/palemoon/base/content/browser.xul | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'application/palemoon')

diff --git a/application/palemoon/base/content/browser.xul b/application/palemoon/base/content/browser.xul
index ea9c3f969..f46055dcc 100644
--- a/application/palemoon/base/content/browser.xul
+++ b/application/palemoon/base/content/browser.xul
@@ -428,7 +428,7 @@
         <textbox id="urlbar" flex="1"
                  placeholder=""
                  type="autocomplete"
-                 autocompletesearch="urlinline history"
+                 autocompletesearch="unifiedcomplete"
                  autocompletesearchparam="enable-actions"
                  autocompletepopup="PopupAutoCompleteRichResult"
                  completeselectedindex="true"
-- 
cgit v1.2.3


From 72e2a43c01d721c7740deed6a2fcd8c10adf05f0 Mon Sep 17 00:00:00 2001
From: "Matt A. Tobin" <email@mattatobin.com>
Date: Mon, 16 Apr 2018 16:52:31 -0400
Subject: Revert "[PALEMOON] Use unified complete in autocompletesearch
 attribute for urlbar"

This reverts commit 2ccac3373fd4eaebe4fdd1812550549232fb6ed1.
---
 application/palemoon/base/content/browser.xul | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'application/palemoon')

diff --git a/application/palemoon/base/content/browser.xul b/application/palemoon/base/content/browser.xul
index f46055dcc..ea9c3f969 100644
--- a/application/palemoon/base/content/browser.xul
+++ b/application/palemoon/base/content/browser.xul
@@ -428,7 +428,7 @@
         <textbox id="urlbar" flex="1"
                  placeholder=""
                  type="autocomplete"
-                 autocompletesearch="unifiedcomplete"
+                 autocompletesearch="urlinline history"
                  autocompletesearchparam="enable-actions"
                  autocompletepopup="PopupAutoCompleteRichResult"
                  completeselectedindex="true"
-- 
cgit v1.2.3


From e719d7b3be222dfafad78c71761bad2bafb1243d Mon Sep 17 00:00:00 2001
From: "Matt A. Tobin" <email@mattatobin.com>
Date: Mon, 16 Apr 2018 16:53:03 -0400
Subject: Revert "[PALEMOON] Source nsPlacesAutoComplete from the suite"

This reverts commit 532de8c09d10767960cdecbb4fcaa4262884016e.
---
 application/palemoon/base/content/tabbrowser.xml   |    2 +-
 application/palemoon/components/places/moz.build   |    5 -
 .../components/places/nsPlacesAutoComplete.js      | 1369 --------------------
 .../places/nsPlacesAutoComplete.manifest           |    3 -
 4 files changed, 1 insertion(+), 1378 deletions(-)
 delete mode 100644 application/palemoon/components/places/nsPlacesAutoComplete.js
 delete mode 100644 application/palemoon/components/places/nsPlacesAutoComplete.manifest

(limited to 'application/palemoon')

diff --git a/application/palemoon/base/content/tabbrowser.xml b/application/palemoon/base/content/tabbrowser.xml
index a7cc6deea..eaf3ea4d9 100644
--- a/application/palemoon/base/content/tabbrowser.xml
+++ b/application/palemoon/base/content/tabbrowser.xml
@@ -73,7 +73,7 @@
                   .getService(Components.interfaces.nsIFaviconService);
       </field>
       <field name="_placesAutocomplete" readonly="true">
-         Components.classes["@mozilla.org/autocomplete/search;1?name=history"]
+         Components.classes["@mozilla.org/autocomplete/search;1?name=unifiedcomplete"]
                    .getService(Components.interfaces.mozIPlacesAutoComplete);
       </field>
       <field name="mTabBox" readonly="true">
diff --git a/application/palemoon/components/places/moz.build b/application/palemoon/components/places/moz.build
index 0df5c5172..2e35e1951 100644
--- a/application/palemoon/components/places/moz.build
+++ b/application/palemoon/components/places/moz.build
@@ -6,10 +6,5 @@
 
 JAR_MANIFESTS += ['jar.mn']
 
-EXTRA_COMPONENTS += [
-    'nsPlacesAutoComplete.js',
-    'nsPlacesAutoComplete.manifest',
-]
-
 EXTRA_JS_MODULES += [ 'PlacesUIUtils.jsm' ]
 
diff --git a/application/palemoon/components/places/nsPlacesAutoComplete.js b/application/palemoon/components/places/nsPlacesAutoComplete.js
deleted file mode 100644
index 681a2aea1..000000000
--- a/application/palemoon/components/places/nsPlacesAutoComplete.js
+++ /dev/null
@@ -1,1369 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*-
- * vim: sw=2 ts=2 sts=2 expandtab
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
-Components.utils.import("resource://gre/modules/Services.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "PlacesUtils",
-                                  "resource://gre/modules/PlacesUtils.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "TelemetryStopwatch",
-                                  "resource://gre/modules/TelemetryStopwatch.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "NetUtil",
-                                  "resource://gre/modules/NetUtil.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "Task",
-                                  "resource://gre/modules/Task.jsm");
-
-////////////////////////////////////////////////////////////////////////////////
-//// Constants
-
-const Cc = Components.classes;
-const Ci = Components.interfaces;
-const Cr = Components.results;
-
-// This SQL query fragment provides the following:
-//   - whether the entry is bookmarked (kQueryIndexBookmarked)
-//   - the bookmark title, if it is a bookmark (kQueryIndexBookmarkTitle)
-//   - the tags associated with a bookmarked entry (kQueryIndexTags)
-const kBookTagSQLFragment =
-  `EXISTS(SELECT 1 FROM moz_bookmarks WHERE fk = h.id) AS bookmarked,
-   (
-     SELECT title FROM moz_bookmarks WHERE fk = h.id AND title NOTNULL
-     ORDER BY lastModified DESC LIMIT 1
-   ) AS btitle,
-   (
-     SELECT GROUP_CONCAT(t.title, ',')
-     FROM moz_bookmarks b
-     JOIN moz_bookmarks t ON t.id = +b.parent AND t.parent = :parent
-     WHERE b.fk = h.id
-   ) AS tags`;
-
-// observer topics
-const kTopicShutdown = "places-shutdown";
-const kPrefChanged = "nsPref:changed";
-
-// Match type constants.  These indicate what type of search function we should
-// be using.
-const MATCH_ANYWHERE = Ci.mozIPlacesAutoComplete.MATCH_ANYWHERE;
-const MATCH_BOUNDARY_ANYWHERE = Ci.mozIPlacesAutoComplete.MATCH_BOUNDARY_ANYWHERE;
-const MATCH_BOUNDARY = Ci.mozIPlacesAutoComplete.MATCH_BOUNDARY;
-const MATCH_BEGINNING = Ci.mozIPlacesAutoComplete.MATCH_BEGINNING;
-const MATCH_BEGINNING_CASE_SENSITIVE = Ci.mozIPlacesAutoComplete.MATCH_BEGINNING_CASE_SENSITIVE;
-
-// AutoComplete index constants.  All AutoComplete queries will provide these
-// columns in this order.
-const kQueryIndexURL = 0;
-const kQueryIndexTitle = 1;
-const kQueryIndexFaviconURL = 2;
-const kQueryIndexBookmarked = 3;
-const kQueryIndexBookmarkTitle = 4;
-const kQueryIndexTags = 5;
-const kQueryIndexVisitCount = 6;
-const kQueryIndexTyped = 7;
-const kQueryIndexPlaceId = 8;
-const kQueryIndexQueryType = 9;
-const kQueryIndexOpenPageCount = 10;
-
-// AutoComplete query type constants.  Describes the various types of queries
-// that we can process.
-const kQueryTypeKeyword = 0;
-const kQueryTypeFiltered = 1;
-
-// This separator is used as an RTL-friendly way to split the title and tags.
-// It can also be used by an nsIAutoCompleteResult consumer to re-split the
-// "comment" back into the title and the tag.
-const kTitleTagsSeparator = " \u2013 ";
-
-const kBrowserUrlbarBranch = "browser.urlbar.";
-// Toggle autocomplete.
-const kBrowserUrlbarAutocompleteEnabledPref = "autocomplete.enabled";
-
-////////////////////////////////////////////////////////////////////////////////
-//// Globals
-
-XPCOMUtils.defineLazyServiceGetter(this, "gTextURIService",
-                                   "@mozilla.org/intl/texttosuburi;1",
-                                   "nsITextToSubURI");
-
-////////////////////////////////////////////////////////////////////////////////
-//// Helpers
-
-/**
- * Initializes our temporary table on a given database.
- *
- * @param aDatabase
- *        The mozIStorageConnection to set up the temp table on.
- */
-function initTempTable(aDatabase)
-{
-  // Note: this should be kept up-to-date with the definition in
-  //       nsPlacesTables.h.
-  let stmt = aDatabase.createAsyncStatement(
-    `CREATE TEMP TABLE moz_openpages_temp (
-       url TEXT PRIMARY KEY
-     , open_count INTEGER
-     )`
-  );
-  stmt.executeAsync();
-  stmt.finalize();
-
-  // Note: this should be kept up-to-date with the definition in
-  //       nsPlacesTriggers.h.
-  stmt = aDatabase.createAsyncStatement(
-    `CREATE TEMPORARY TRIGGER moz_openpages_temp_afterupdate_trigger
-     AFTER UPDATE OF open_count ON moz_openpages_temp FOR EACH ROW
-     WHEN NEW.open_count = 0
-     BEGIN
-       DELETE FROM moz_openpages_temp
-       WHERE url = NEW.url;
-     END`
-  );
-  stmt.executeAsync();
-  stmt.finalize();
-}
-
-/**
- * Used to unescape encoded URI strings, and drop information that we do not
- * care about for searching.
- *
- * @param aURIString
- *        The text to unescape and modify.
- * @return the modified uri.
- */
-function fixupSearchText(aURIString)
-{
-  let uri = stripPrefix(aURIString);
-  return gTextURIService.unEscapeURIForUI("UTF-8", uri);
-}
-
-/**
- * Strip prefixes from the URI that we don't care about for searching.
- *
- * @param aURIString
- *        The text to modify.
- * @return the modified uri.
- */
-function stripPrefix(aURIString)
-{
-  let uri = aURIString;
-
-  if (uri.indexOf("http://") == 0) {
-    uri = uri.slice(7);
-  }
-  else if (uri.indexOf("https://") == 0) {
-    uri = uri.slice(8);
-  }
-  else if (uri.indexOf("ftp://") == 0) {
-    uri = uri.slice(6);
-  }
-
-  if (uri.indexOf("www.") == 0) {
-    uri = uri.slice(4);
-  }
-  return uri;
-}
-
-/**
- * safePrefGetter get the pref with type safety.
- * This will return the default value provided if no pref is set.
- *
- * @param aPrefBranch
- *        The nsIPrefBranch containing the required preference
- * @param aName
- *        A preference name
- * @param aDefault
- *        The preference's default value
- * @return the preference value or provided default
- */
-
-function safePrefGetter(aPrefBranch, aName, aDefault) {
-  let types = {
-    boolean: "Bool",
-    number: "Int",
-    string: "Char"
-  };
-  let type = types[typeof(aDefault)];
-  if (!type) {
-    throw "Unknown type!";
-  }
-
-  // If the pref isn't set, we want to use the default.
-  if (aPrefBranch.getPrefType(aName) == Ci.nsIPrefBranch.PREF_INVALID) {
-    return aDefault;
-  }
-  try {
-    return aPrefBranch["get" + type + "Pref"](aName);
-  }
-  catch (e) {
-    return aDefault;
-  }
-}
-
-/**
- * Whether UnifiedComplete is alive.
- */
-function isUnifiedCompleteInstantiated() {
-  try {
-    return Components.manager.QueryInterface(Ci.nsIServiceManager)
-                     .isServiceInstantiated(Cc["@mozilla.org/autocomplete/search;1?name=unifiedcomplete"],
-                                            Ci.mozIPlacesAutoComplete);
-  } catch (ex) {
-    return false;
-  }
-}
-
-////////////////////////////////////////////////////////////////////////////////
-//// AutoCompleteStatementCallbackWrapper class
-
-/**
- * Wraps a callback and ensures that handleCompletion is not dispatched if the
- * query is no longer tracked.
- *
- * @param aAutocomplete
- *        A reference to a nsPlacesAutoComplete.
- * @param aCallback
- *        A reference to a mozIStorageStatementCallback
- * @param aDBConnection
- *        The database connection to execute the queries on.
- */
-function AutoCompleteStatementCallbackWrapper(aAutocomplete, aCallback,
-                                              aDBConnection)
-{
-  this._autocomplete = aAutocomplete;
-  this._callback = aCallback;
-  this._db = aDBConnection;
-}
-
-AutoCompleteStatementCallbackWrapper.prototype = {
-  //////////////////////////////////////////////////////////////////////////////
-  //// mozIStorageStatementCallback
-
-  handleResult: function ACSCW_handleResult(aResultSet)
-  {
-    this._callback.handleResult.apply(this._callback, arguments);
-  },
-
-  handleError: function ACSCW_handleError(aError)
-  {
-    this._callback.handleError.apply(this._callback, arguments);
-  },
-
-  handleCompletion: function ACSCW_handleCompletion(aReason)
-  {
-    // Only dispatch handleCompletion if we are not done searching and are a
-    // pending search.
-    if (!this._autocomplete.isSearchComplete() &&
-        this._autocomplete.isPendingSearch(this._handle)) {
-      this._callback.handleCompletion.apply(this._callback, arguments);
-    }
-  },
-
-  //////////////////////////////////////////////////////////////////////////////
-  //// AutoCompleteStatementCallbackWrapper
-
-  /**
-   * Executes the specified query asynchronously.  This object will notify
-   * this._callback if we should notify (logic explained in handleCompletion).
-   *
-   * @param aQueries
-   *        The queries to execute asynchronously.
-   * @return a mozIStoragePendingStatement that can be used to cancel the
-   *         queries.
-   */
-  executeAsync: function ACSCW_executeAsync(aQueries)
-  {
-    return this._handle = this._db.executeAsync(aQueries, aQueries.length,
-                                                this);
-  },
-
-  //////////////////////////////////////////////////////////////////////////////
-  //// nsISupports
-
-  QueryInterface: XPCOMUtils.generateQI([
-    Ci.mozIStorageStatementCallback,
-  ])
-};
-
-////////////////////////////////////////////////////////////////////////////////
-//// nsPlacesAutoComplete class
-//// @mozilla.org/autocomplete/search;1?name=history
-
-function nsPlacesAutoComplete()
-{
-  //////////////////////////////////////////////////////////////////////////////
-  //// Shared Constants for Smart Getters
-
-  // TODO bug 412736 in case of a frecency tie, break it with h.typed and
-  // h.visit_count which is better than nothing.  This is slow, so not doing it
-  // yet...
-  function baseQuery(conditions = "") {
-    let query = `SELECT h.url, h.title, f.url, ${kBookTagSQLFragment},
-                        h.visit_count, h.typed, h.id, :query_type,
-                        t.open_count
-                 FROM moz_places h
-                 LEFT JOIN moz_favicons f ON f.id = h.favicon_id
-                 LEFT JOIN moz_openpages_temp t ON t.url = h.url
-                 WHERE h.frecency <> 0
-                   AND AUTOCOMPLETE_MATCH(:searchString, h.url,
-                                          IFNULL(btitle, h.title), tags,
-                                          h.visit_count, h.typed,
-                                          bookmarked, t.open_count,
-                                          :matchBehavior, :searchBehavior)
-                 ${conditions}
-                 ORDER BY h.frecency DESC, h.id DESC
-                 LIMIT :maxResults`;
-    return query;
-  }
-
-  //////////////////////////////////////////////////////////////////////////////
-  //// Smart Getters
-
-  XPCOMUtils.defineLazyGetter(this, "_db", function() {
-    // Get a cloned, read-only version of the database.  We'll only ever write
-    // to our own in-memory temp table, and having a cloned copy means we do not
-    // run the risk of our queries taking longer due to the main database
-    // connection performing a long-running task.
-    let db = PlacesUtils.history.DBConnection.clone(true);
-
-    // Autocomplete often fallbacks to a table scan due to lack of text indices.
-    // In such cases a larger cache helps reducing IO.  The default Storage
-    // value is MAX_CACHE_SIZE_BYTES in storage/mozStorageConnection.cpp.
-    let stmt = db.createAsyncStatement("PRAGMA cache_size = -6144"); // 6MiB
-    stmt.executeAsync();
-    stmt.finalize();
-
-    // Create our in-memory tables for tab tracking.
-    initTempTable(db);
-
-    // Populate the table with current open pages cache contents.
-    if (this._openPagesCache.length > 0) {
-      // Avoid getter re-entrance from the _registerOpenPageQuery lazy getter.
-      let stmt = this._registerOpenPageQuery =
-        db.createAsyncStatement(this._registerOpenPageQuerySQL);
-      let params = stmt.newBindingParamsArray();
-      for (let i = 0; i < this._openPagesCache.length; i++) {
-        let bp = params.newBindingParams();
-        bp.bindByName("page_url", this._openPagesCache[i]);
-        params.addParams(bp);
-      }
-      stmt.bindParameters(params);
-      stmt.executeAsync();
-      stmt.finalize();
-      delete this._openPagesCache;
-    }
-
-    return db;
-  });
-
-  this._customQuery = (conditions = "") => {
-    return this._db.createAsyncStatement(baseQuery(conditions));
-  };
-
-  XPCOMUtils.defineLazyGetter(this, "_defaultQuery", function() {
-    return this._db.createAsyncStatement(baseQuery());
-  });
-
-  XPCOMUtils.defineLazyGetter(this, "_historyQuery", function() {
-    // Enforce ignoring the visit_count index, since the frecency one is much
-    // faster in this case.  ANALYZE helps the query planner to figure out the
-    // faster path, but it may not have run yet.
-    return this._db.createAsyncStatement(baseQuery("AND +h.visit_count > 0"));
-  });
-
-  XPCOMUtils.defineLazyGetter(this, "_bookmarkQuery", function() {
-    return this._db.createAsyncStatement(baseQuery("AND bookmarked"));
-  });
-
-  XPCOMUtils.defineLazyGetter(this, "_tagsQuery", function() {
-    return this._db.createAsyncStatement(baseQuery("AND tags IS NOT NULL"));
-  });
-
-  XPCOMUtils.defineLazyGetter(this, "_openPagesQuery", function() {
-    return this._db.createAsyncStatement(
-      `SELECT t.url, t.url, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-              :query_type, t.open_count, NULL
-       FROM moz_openpages_temp t
-       LEFT JOIN moz_places h ON h.url = t.url
-       WHERE h.id IS NULL
-         AND AUTOCOMPLETE_MATCH(:searchString, t.url, t.url, NULL,
-                                NULL, NULL, NULL, t.open_count,
-                                :matchBehavior, :searchBehavior)
-       ORDER BY t.ROWID DESC
-       LIMIT :maxResults`
-    );
-  });
-
-  XPCOMUtils.defineLazyGetter(this, "_typedQuery", function() {
-    return this._db.createAsyncStatement(baseQuery("AND h.typed = 1"));
-  });
-
-  XPCOMUtils.defineLazyGetter(this, "_adaptiveQuery", function() {
-    return this._db.createAsyncStatement(
-      `/* do not warn (bug 487789) */
-       SELECT h.url, h.title, f.url, ${kBookTagSQLFragment},
-              h.visit_count, h.typed, h.id, :query_type, t.open_count
-       FROM (
-       SELECT ROUND(
-           MAX(use_count) * (1 + (input = :search_string)), 1
-         ) AS rank, place_id
-         FROM moz_inputhistory
-         WHERE input BETWEEN :search_string AND :search_string || X'FFFF'
-         GROUP BY place_id
-       ) AS i
-       JOIN moz_places h ON h.id = i.place_id
-       LEFT JOIN moz_favicons f ON f.id = h.favicon_id
-       LEFT JOIN moz_openpages_temp t ON t.url = h.url
-       WHERE AUTOCOMPLETE_MATCH(NULL, h.url,
-                                IFNULL(btitle, h.title), tags,
-                                h.visit_count, h.typed, bookmarked,
-                                t.open_count,
-                                :matchBehavior, :searchBehavior)
-       ORDER BY rank DESC, h.frecency DESC`
-    );
-  });
-
-  XPCOMUtils.defineLazyGetter(this, "_keywordQuery", function() {
-    return this._db.createAsyncStatement(
-      `/* do not warn (bug 487787) */
-       SELECT REPLACE(h.url, '%s', :query_string) AS search_url, h.title,
-       IFNULL(f.url, (SELECT f.url
-                      FROM moz_places
-                      JOIN moz_favicons f ON f.id = favicon_id
-                      WHERE rev_host = h.rev_host
-                      ORDER BY frecency DESC
-                      LIMIT 1)
-       ), 1, NULL, NULL, h.visit_count, h.typed, h.id,
-       :query_type, t.open_count
-       FROM moz_keywords k
-       JOIN moz_places h ON k.place_id = h.id
-       LEFT JOIN moz_favicons f ON f.id = h.favicon_id
-       LEFT JOIN moz_openpages_temp t ON t.url = search_url
-       WHERE k.keyword = LOWER(:keyword)`
-    );
-  });
-
-  this._registerOpenPageQuerySQL =
-    `INSERT OR REPLACE INTO moz_openpages_temp (url, open_count)
-       VALUES (:page_url,
-         IFNULL(
-           (
-             SELECT open_count + 1
-             FROM moz_openpages_temp
-             WHERE url = :page_url
-           ),
-           1
-         )
-       )`;
-  XPCOMUtils.defineLazyGetter(this, "_registerOpenPageQuery", function() {
-    return this._db.createAsyncStatement(this._registerOpenPageQuerySQL);
-  });
-
-  XPCOMUtils.defineLazyGetter(this, "_unregisterOpenPageQuery", function() {
-    return this._db.createAsyncStatement(
-      `UPDATE moz_openpages_temp
-       SET open_count = open_count - 1
-       WHERE url = :page_url`
-    );
-  });
-
-  //////////////////////////////////////////////////////////////////////////////
-  //// Initialization
-
-  // load preferences
-  this._prefs = Cc["@mozilla.org/preferences-service;1"].
-                getService(Ci.nsIPrefService).
-                getBranch(kBrowserUrlbarBranch);
-  this._syncEnabledPref();
-  this._loadPrefs(true);
-
-  // register observers
-  this._os = Cc["@mozilla.org/observer-service;1"].
-              getService(Ci.nsIObserverService);
-  this._os.addObserver(this, kTopicShutdown, false);
-
-}
-
-nsPlacesAutoComplete.prototype = {
-  //////////////////////////////////////////////////////////////////////////////
-  //// nsIAutoCompleteSearch
-
-  startSearch: function PAC_startSearch(aSearchString, aSearchParam,
-                                        aPreviousResult, aListener)
-  {
-    // Stop the search in case the controller has not taken care of it.
-    this.stopSearch();
-
-    // Note: We don't use aPreviousResult to make sure ordering of results are
-    //       consistent.  See bug 412730 for more details.
-
-    // We want to store the original string with no leading or trailing
-    // whitespace for case sensitive searches.
-    this._originalSearchString = aSearchString.trim();
-
-    this._currentSearchString =
-      fixupSearchText(this._originalSearchString.toLowerCase());
-
-    let params = new Set(aSearchParam.split(" "));
-    this._enableActions = params.has("enable-actions");
-    this._disablePrivateActions = params.has("disable-private-actions");
-
-    this._listener = aListener;
-    let result = Cc["@mozilla.org/autocomplete/simple-result;1"].
-                 createInstance(Ci.nsIAutoCompleteSimpleResult);
-    result.setSearchString(aSearchString);
-    result.setListener(this);
-    this._result = result;
-
-    // If we are not enabled, we need to return now.
-    if (!this._enabled) {
-      this._finishSearch(true);
-      return;
-    }
-
-    // Reset our search behavior to the default.
-    if (this._currentSearchString) {
-      this._behavior = this._defaultBehavior;
-    }
-    else {
-      this._behavior = this._emptySearchDefaultBehavior;
-    }
-    // For any given search, we run up to four queries:
-    // 1) keywords (this._keywordQuery)
-    // 2) adaptive learning (this._adaptiveQuery)
-    // 3) open pages not supported by history (this._openPagesQuery)
-    // 4) query from this._getSearch
-    // (1) only gets ran if we get any filtered tokens from this._getSearch,
-    // since if there are no tokens, there is nothing to match, so there is no
-    // reason to run the query).
-    let {query, tokens} =
-      this._getSearch(this._getUnfilteredSearchTokens(this._currentSearchString));
-    let queries = tokens.length ?
-      [this._getBoundKeywordQuery(tokens), this._getBoundAdaptiveQuery()] :
-      [this._getBoundAdaptiveQuery()];
-
-    if (this._hasBehavior("openpage")) {
-      queries.push(this._getBoundOpenPagesQuery(tokens));
-    }
-    queries.push(query);
-
-    // Start executing our queries.
-    this._telemetryStartTime = Date.now();
-    this._executeQueries(queries);
-
-    // Set up our persistent state for the duration of the search.
-    this._searchTokens = tokens;
-    this._usedPlaces = {};
-  },
-
-  stopSearch: function PAC_stopSearch()
-  {
-    // We need to cancel our searches so we do not get any [more] results.
-    // However, it's possible we haven't actually started any searches, so this
-    // method may throw because this._pendingQuery may be undefined.
-    if (this._pendingQuery) {
-      this._stopActiveQuery();
-    }
-
-    this._finishSearch(false);
-  },
-
-  //////////////////////////////////////////////////////////////////////////////
-  //// nsIAutoCompleteSimpleResultListener
-
-  onValueRemoved: function PAC_onValueRemoved(aResult, aURISpec, aRemoveFromDB)
-  {
-    if (aRemoveFromDB) {
-      PlacesUtils.history.removePage(NetUtil.newURI(aURISpec));
-    }
-  },
-
-  //////////////////////////////////////////////////////////////////////////////
-  //// mozIPlacesAutoComplete
-
-  // If the connection has not yet been started, use this local cache.  This
-  // prevents autocomplete from initing the database till the first search.
-  _openPagesCache: [],
-  registerOpenPage: function PAC_registerOpenPage(aURI)
-  {
-    if (!this._databaseInitialized) {
-      this._openPagesCache.push(aURI.spec);
-      return;
-    }
-
-    let stmt = this._registerOpenPageQuery;
-    stmt.params.page_url = aURI.spec;
-    stmt.executeAsync();
-  },
-
-  unregisterOpenPage: function PAC_unregisterOpenPage(aURI)
-  {
-    if (!this._databaseInitialized) {
-      let index = this._openPagesCache.indexOf(aURI.spec);
-      if (index != -1) {
-        this._openPagesCache.splice(index, 1);
-      }
-      return;
-    }
-
-    let stmt = this._unregisterOpenPageQuery;
-    stmt.params.page_url = aURI.spec;
-    stmt.executeAsync();
-  },
-
-  //////////////////////////////////////////////////////////////////////////////
-  //// mozIStorageStatementCallback
-
-  handleResult: function PAC_handleResult(aResultSet)
-  {
-    let row, haveMatches = false;
-    while ((row = aResultSet.getNextRow())) {
-      let match = this._processRow(row);
-      haveMatches = haveMatches || match;
-
-      if (this._result.matchCount == this._maxRichResults) {
-        // We have enough results, so stop running our search.
-        this._stopActiveQuery();
-
-        // And finish our search.
-        this._finishSearch(true);
-        return;
-      }
-
-    }
-
-    // Notify about results if we've gotten them.
-    if (haveMatches) {
-      this._notifyResults(true);
-    }
-  },
-
-  handleError: function PAC_handleError(aError)
-  {
-    Components.utils.reportError("Places AutoComplete: An async statement encountered an " +
-                                 "error: " + aError.result + ", '" + aError.message + "'");
-  },
-
-  handleCompletion: function PAC_handleCompletion(aReason)
-  {
-    // If we have already finished our search, we should bail out early.
-    if (this.isSearchComplete()) {
-      return;
-    }
-
-    // If we do not have enough results, and our match type is
-    // MATCH_BOUNDARY_ANYWHERE, search again with MATCH_ANYWHERE to get more
-    // results.
-    if (this._matchBehavior == MATCH_BOUNDARY_ANYWHERE &&
-        this._result.matchCount < this._maxRichResults && !this._secondPass) {
-      this._secondPass = true;
-      let queries = [
-        this._getBoundAdaptiveQuery(MATCH_ANYWHERE),
-        this._getBoundSearchQuery(MATCH_ANYWHERE, this._searchTokens),
-      ];
-      this._executeQueries(queries);
-      return;
-    }
-
-    this._finishSearch(true);
-  },
-
-  //////////////////////////////////////////////////////////////////////////////
-  //// nsIObserver
-
-  observe: function PAC_observe(aSubject, aTopic, aData)
-  {
-    if (aTopic == kTopicShutdown) {
-      this._os.removeObserver(this, kTopicShutdown);
-
-      // Remove our preference observer.
-      this._prefs.removeObserver("", this);
-      delete this._prefs;
-
-      // Finalize the statements that we have used.
-      let stmts = [
-        "_defaultQuery",
-        "_historyQuery",
-        "_bookmarkQuery",
-        "_tagsQuery",
-        "_openPagesQuery",
-        "_typedQuery",
-        "_adaptiveQuery",
-        "_keywordQuery",
-        "_registerOpenPageQuery",
-        "_unregisterOpenPageQuery",
-      ];
-      for (let i = 0; i < stmts.length; i++) {
-        // We do not want to create any query we haven't already created, so
-        // see if it is a getter first.
-        if (Object.getOwnPropertyDescriptor(this, stmts[i]).value !== undefined) {
-          this[stmts[i]].finalize();
-        }
-      }
-
-      if (this._databaseInitialized) {
-        this._db.asyncClose();
-      }
-    }
-    else if (aTopic == kPrefChanged) {
-      // Avoid re-entrancy when flipping linked preferences.
-      if (this._ignoreNotifications)
-        return;
-      this._ignoreNotifications = true;
-      this._loadPrefs(false, aTopic, aData);
-      this._ignoreNotifications = false;
-    }
-  },
-
-  //////////////////////////////////////////////////////////////////////////////
-  //// nsPlacesAutoComplete
-
-  get _databaseInitialized() {
-    return Object.getOwnPropertyDescriptor(this, "_db").value !== undefined;
-  },
-
-  /**
-   * Generates the tokens used in searching from a given string.
-   *
-   * @param aSearchString
-   *        The string to generate tokens from.
-   * @return an array of tokens.
-   */
-  _getUnfilteredSearchTokens: function PAC_unfilteredSearchTokens(aSearchString)
-  {
-    // Calling split on an empty string will return an array containing one
-    // empty string.  We don't want that, as it'll break our logic, so return an
-    // empty array then.
-    return aSearchString.length ? aSearchString.split(" ") : [];
-  },
-
-  /**
-   * Properly cleans up when searching is completed.
-   *
-   * @param aNotify
-   *        Indicates if we should notify the AutoComplete listener about our
-   *        results or not.
-   */
-  _finishSearch: function PAC_finishSearch(aNotify)
-  {
-    // Notify about results if we are supposed to.
-    if (aNotify) {
-      this._notifyResults(false);
-    }
-
-    // Clear our state
-    delete this._originalSearchString;
-    delete this._currentSearchString;
-    delete this._strippedPrefix;
-    delete this._searchTokens;
-    delete this._listener;
-    delete this._result;
-    delete this._usedPlaces;
-    delete this._pendingQuery;
-    this._secondPass = false;
-    this._enableActions = false;
-  },
-
-  /**
-   * Executes the given queries asynchronously.
-   *
-   * @param aQueries
-   *        The queries to execute.
-   */
-  _executeQueries: function PAC_executeQueries(aQueries)
-  {
-    // Because we might get a handleCompletion for canceled queries, we want to
-    // filter out queries we no longer care about (described in the
-    // handleCompletion implementation of AutoCompleteStatementCallbackWrapper).
-
-    // Create our wrapper object and execute the queries.
-    let wrapper = new AutoCompleteStatementCallbackWrapper(this, this, this._db);
-    this._pendingQuery = wrapper.executeAsync(aQueries);
-  },
-
-  /**
-   * Stops executing our active query.
-   */
-  _stopActiveQuery: function PAC_stopActiveQuery()
-  {
-    this._pendingQuery.cancel();
-    delete this._pendingQuery;
-  },
-
-  /**
-   * Notifies the listener about results.
-   *
-   * @param aSearchOngoing
-   *        Indicates if the search is ongoing or not.
-   */
-  _notifyResults: function PAC_notifyResults(aSearchOngoing)
-  {
-    let result = this._result;
-    let resultCode = result.matchCount ? "RESULT_SUCCESS" : "RESULT_NOMATCH";
-    if (aSearchOngoing) {
-      resultCode += "_ONGOING";
-    }
-    result.setSearchResult(Ci.nsIAutoCompleteResult[resultCode]);
-    this._listener.onSearchResult(this, result);
-    if (this._telemetryStartTime) {
-      let elapsed = Date.now() - this._telemetryStartTime;
-      if (elapsed > 50) {
-        try {
-          Services.telemetry
-                  .getHistogramById("PLACES_AUTOCOMPLETE_1ST_RESULT_TIME_MS")
-                  .add(elapsed);
-        } catch (ex) {
-          Components.utils.reportError("Unable to report telemetry.");
-        }
-      }
-      this._telemetryStartTime = null;
-    }
-  },
-
-  /**
-   * Synchronize suggest.* prefs with autocomplete.enabled.
-   */
-  _syncEnabledPref: function PAC_syncEnabledPref()
-  {
-    let suggestPrefs = ["suggest.history", "suggest.bookmark", "suggest.openpage"];
-    let types = ["History", "Bookmark", "Openpage"];
-
-    this._enabled = safePrefGetter(this._prefs, kBrowserUrlbarAutocompleteEnabledPref,
-                                   true);
-    this._suggestHistory = safePrefGetter(this._prefs, "suggest.history", true);
-    this._suggestBookmark = safePrefGetter(this._prefs, "suggest.bookmark", true);
-    this._suggestOpenpage = safePrefGetter(this._prefs, "suggest.openpage", true);
-
-    if (this._enabled) {
-      // If the autocomplete preference is active, activate all suggest
-      // preferences only if all of them are false.
-      if (types.every(type => this["_suggest" + type] == false)) {
-        for (let type of suggestPrefs) {
-          this._prefs.setBoolPref(type, true);
-        }
-      }
-    } else {
-      // If the preference was deactivated, deactivate all suggest preferences.
-      for (let type of suggestPrefs) {
-        this._prefs.setBoolPref(type, false);
-      }
-    }
-  },
-
-  /**
-   * Loads the preferences that we care about.
-   *
-   * @param [optional] aRegisterObserver
-   *        Indicates if the preference observer should be added or not.  The
-   *        default value is false.
-   * @param [optional] aTopic
-   *        Observer's topic, if any.
-   * @param [optional] aSubject
-   *        Observer's subject, if any.
-   */
-  _loadPrefs: function PAC_loadPrefs(aRegisterObserver, aTopic, aData)
-  {
-    // Avoid race conditions with UnifiedComplete component.
-    if (aData && !isUnifiedCompleteInstantiated()) {
-      // Synchronize suggest.* prefs with autocomplete.enabled.
-      if (aData == kBrowserUrlbarAutocompleteEnabledPref) {
-        this._syncEnabledPref();
-      } else if (aData.startsWith("suggest.")) {
-        let suggestPrefs = ["suggest.history", "suggest.bookmark", "suggest.openpage"];
-        this._prefs.setBoolPref(kBrowserUrlbarAutocompleteEnabledPref,
-                                suggestPrefs.some(pref => safePrefGetter(this._prefs, pref, true)));
-      }
-    }
-
-    this._enabled = safePrefGetter(this._prefs,
-                                   kBrowserUrlbarAutocompleteEnabledPref,
-                                   true);
-    this._matchBehavior = safePrefGetter(this._prefs,
-                                         "matchBehavior",
-                                         MATCH_BOUNDARY_ANYWHERE);
-    this._filterJavaScript = safePrefGetter(this._prefs, "filter.javascript", true);
-    this._maxRichResults = safePrefGetter(this._prefs, "maxRichResults", 25);
-    this._restrictHistoryToken = safePrefGetter(this._prefs,
-                                                "restrict.history", "^");
-    this._restrictBookmarkToken = safePrefGetter(this._prefs,
-                                                 "restrict.bookmark", "*");
-    this._restrictTypedToken = safePrefGetter(this._prefs, "restrict.typed", "~");
-    this._restrictTagToken = safePrefGetter(this._prefs, "restrict.tag", "+");
-    this._restrictOpenPageToken = safePrefGetter(this._prefs,
-                                                 "restrict.openpage", "%");
-    this._matchTitleToken = safePrefGetter(this._prefs, "match.title", "#");
-    this._matchURLToken = safePrefGetter(this._prefs, "match.url", "@");
-
-    this._suggestHistory = safePrefGetter(this._prefs, "suggest.history", true);
-    this._suggestBookmark = safePrefGetter(this._prefs, "suggest.bookmark", true);
-    this._suggestOpenpage = safePrefGetter(this._prefs, "suggest.openpage", true);
-    this._suggestTyped = safePrefGetter(this._prefs, "suggest.history.onlyTyped", false);
-
-    // If history is not set, onlyTyped value should be ignored.
-    if (!this._suggestHistory) {
-      this._suggestTyped = false;
-    }
-    let types = ["History", "Bookmark", "Openpage", "Typed"];
-    this._defaultBehavior = types.reduce((memo, type) => {
-      let prefValue = this["_suggest" + type];
-      return memo | (prefValue &&
-                     Ci.mozIPlacesAutoComplete["BEHAVIOR_" + type.toUpperCase()]);
-    }, 0);
-
-    // Further restrictions to apply for "empty searches" (i.e. searches for "").
-    // The empty behavior is typed history, if history is enabled. Otherwise,
-    // it is bookmarks, if they are enabled. If both history and bookmarks are disabled,
-    // it defaults to open pages.
-    this._emptySearchDefaultBehavior = Ci.mozIPlacesAutoComplete.BEHAVIOR_RESTRICT;
-    if (this._suggestHistory) {
-      this._emptySearchDefaultBehavior |= Ci.mozIPlacesAutoComplete.BEHAVIOR_HISTORY |
-                                          Ci.mozIPlacesAutoComplete.BEHAVIOR_TYPED;
-    } else if (this._suggestBookmark) {
-      this._emptySearchDefaultBehavior |= Ci.mozIPlacesAutoComplete.BEHAVIOR_BOOKMARK;
-    } else {
-      this._emptySearchDefaultBehavior |= Ci.mozIPlacesAutoComplete.BEHAVIOR_OPENPAGE;
-    }
-
-    // Validate matchBehavior; default to MATCH_BOUNDARY_ANYWHERE.
-    if (this._matchBehavior != MATCH_ANYWHERE &&
-        this._matchBehavior != MATCH_BOUNDARY &&
-        this._matchBehavior != MATCH_BEGINNING) {
-      this._matchBehavior = MATCH_BOUNDARY_ANYWHERE;
-    }
-    // register observer
-    if (aRegisterObserver) {
-      this._prefs.addObserver("", this, false);
-    }
-  },
-
-  /**
-   * Given an array of tokens, this function determines which query should be
-   * ran.  It also removes any special search tokens.
-   *
-   * @param aTokens
-   *        An array of search tokens.
-   * @return an object with two properties:
-   *         query: the correctly optimized, bound query to search the database
-   *                with.
-   *         tokens: the filtered list of tokens to search with.
-   */
-  _getSearch: function PAC_getSearch(aTokens)
-  {
-    let foundToken = false;
-    let restrict = (behavior) => {
-      if (!foundToken) {
-        this._behavior = 0;
-        this._setBehavior("restrict");
-        foundToken = true;
-      }
-      this._setBehavior(behavior);
-    };
-
-    // Set the proper behavior so our call to _getBoundSearchQuery gives us the
-    // correct query.
-    for (let i = aTokens.length - 1; i >= 0; i--) {
-      switch (aTokens[i]) {
-        case this._restrictHistoryToken:
-          restrict("history");
-          break;
-        case this._restrictBookmarkToken:
-          restrict("bookmark");
-          break;
-        case this._restrictTagToken:
-          restrict("tag");
-          break;
-        case this._restrictOpenPageToken:
-          if (!this._enableActions) {
-            continue;
-          }
-          restrict("openpage");
-          break;
-        case this._matchTitleToken:
-          restrict("title");
-          break;
-        case this._matchURLToken:
-          restrict("url");
-          break;
-        case this._restrictTypedToken:
-          restrict("typed");
-          break;
-        default:
-          // We do not want to remove the token if we did not match.
-          continue;
-      }
-
-      aTokens.splice(i, 1);
-    }
-
-    // Set the right JavaScript behavior based on our preference.  Note that the
-    // preference is whether or not we should filter JavaScript, and the
-    // behavior is if we should search it or not.
-    if (!this._filterJavaScript) {
-      this._setBehavior("javascript");
-    }
-
-    return {
-      query: this._getBoundSearchQuery(this._matchBehavior, aTokens),
-      tokens: aTokens
-    };
-  },
-
-  /**
-   * @return a string consisting of the search query to be used based on the
-   * previously set urlbar suggestion preferences.
-   */
-  _getSuggestionPrefQuery: function PAC_getSuggestionPrefQuery()
-  {
-    if (!this._hasBehavior("restrict") && this._hasBehavior("history") &&
-        this._hasBehavior("bookmark")) {
-      return this._hasBehavior("typed") ? this._customQuery("AND h.typed = 1")
-                                        : this._defaultQuery;
-    }
-    let conditions = [];
-    if (this._hasBehavior("history")) {
-      // Enforce ignoring the visit_count index, since the frecency one is much
-      // faster in this case.  ANALYZE helps the query planner to figure out the
-      // faster path, but it may not have up-to-date information yet.
-      conditions.push("+h.visit_count > 0");
-    }
-    if (this._hasBehavior("typed")) {
-      conditions.push("h.typed = 1");
-    }
-    if (this._hasBehavior("bookmark")) {
-      conditions.push("bookmarked");
-    }
-    if (this._hasBehavior("tag")) {
-      conditions.push("tags NOTNULL");
-    }
-
-    return conditions.length ? this._customQuery("AND " + conditions.join(" AND "))
-                             : this._defaultQuery;
-  },
-
-  /**
-   * Obtains the search query to be used based on the previously set search
-   * behaviors (accessed by this._hasBehavior).  The query is bound and ready to
-   * execute.
-   *
-   * @param aMatchBehavior
-   *        How this query should match its tokens to the search string.
-   * @param aTokens
-   *        An array of search tokens.
-   * @return the correctly optimized query to search the database with and the
-   *         new list of tokens to search with.  The query has all the needed
-   *         parameters bound, so consumers can execute it without doing any
-   *         additional work.
-   */
-  _getBoundSearchQuery: function PAC_getBoundSearchQuery(aMatchBehavior,
-                                                         aTokens)
-  {
-    let query = this._getSuggestionPrefQuery();
-
-    // Bind the needed parameters to the query so consumers can use it.
-    let params = query.params;
-    params.parent = PlacesUtils.tagsFolderId;
-    params.query_type = kQueryTypeFiltered;
-    params.matchBehavior = aMatchBehavior;
-    params.searchBehavior = this._behavior;
-
-    // We only want to search the tokens that we are left with - not the
-    // original search string.
-    params.searchString = aTokens.join(" ");
-
-    // Limit the query to the the maximum number of desired results.
-    // This way we can avoid doing more work than needed.
-    params.maxResults = this._maxRichResults;
-
-    return query;
-  },
-
-  _getBoundOpenPagesQuery: function PAC_getBoundOpenPagesQuery(aTokens)
-  {
-    let query = this._openPagesQuery;
-
-    // Bind the needed parameters to the query so consumers can use it.
-    let params = query.params;
-    params.query_type = kQueryTypeFiltered;
-    params.matchBehavior = this._matchBehavior;
-    params.searchBehavior = this._behavior;
-
-    // We only want to search the tokens that we are left with - not the
-    // original search string.
-    params.searchString = aTokens.join(" ");
-    params.maxResults = this._maxRichResults;
-
-    return query;
-  },
-
-  /**
-   * Obtains the keyword query with the properly bound parameters.
-   *
-   * @param aTokens
-   *        The array of search tokens to check against.
-   * @return the bound keyword query.
-   */
-  _getBoundKeywordQuery: function PAC_getBoundKeywordQuery(aTokens)
-  {
-    // The keyword is the first word in the search string, with the parameters
-    // following it.
-    let searchString = this._originalSearchString;
-    let queryString = "";
-    let queryIndex = searchString.indexOf(" ");
-    if (queryIndex != -1) {
-      queryString = searchString.substring(queryIndex + 1);
-    }
-    // We need to escape the parameters as if they were the query in a URL
-    queryString = encodeURIComponent(queryString).replace(/%20/g, "+");
-
-    // The first word could be a keyword, so that's what we'll search.
-    let keyword = aTokens[0];
-
-    let query = this._keywordQuery;
-    let params = query.params;
-    params.keyword = keyword;
-    params.query_string = queryString;
-    params.query_type = kQueryTypeKeyword;
-
-    return query;
-  },
-
-  /**
-   * Obtains the adaptive query with the properly bound parameters.
-   *
-   * @return the bound adaptive query.
-   */
-  _getBoundAdaptiveQuery: function PAC_getBoundAdaptiveQuery(aMatchBehavior)
-  {
-    // If we were not given a match behavior, use the stored match behavior.
-    if (arguments.length == 0) {
-      aMatchBehavior = this._matchBehavior;
-    }
-
-    let query = this._adaptiveQuery;
-    let params = query.params;
-    params.parent = PlacesUtils.tagsFolderId;
-    params.search_string = this._currentSearchString;
-    params.query_type = kQueryTypeFiltered;
-    params.matchBehavior = aMatchBehavior;
-    params.searchBehavior = this._behavior;
-
-    return query;
-  },
-
-  /**
-   * Processes a mozIStorageRow to generate the proper data for the AutoComplete
-   * result.  This will add an entry to the current result if it matches the
-   * criteria.
-   *
-   * @param aRow
-   *        The row to process.
-   * @return true if the row is accepted, and false if not.
-   */
-  _processRow: function PAC_processRow(aRow)
-  {
-    // Before we do any work, make sure this entry isn't already in our results.
-    let entryId = aRow.getResultByIndex(kQueryIndexPlaceId);
-    let escapedEntryURL = aRow.getResultByIndex(kQueryIndexURL);
-    let openPageCount = aRow.getResultByIndex(kQueryIndexOpenPageCount) || 0;
-
-    // If actions are enabled and the page is open, add only the switch-to-tab
-    // result.  Otherwise, add the normal result.
-    let [url, action] = this._enableActions && openPageCount > 0 && this._hasBehavior("openpage") ?
-                        ["moz-action:switchtab," + escapedEntryURL, "action "] :
-                        [escapedEntryURL, ""];
-
-    if (this._inResults(entryId, url)) {
-      return false;
-    }
-
-    let entryTitle = aRow.getResultByIndex(kQueryIndexTitle) || "";
-    let entryFavicon = aRow.getResultByIndex(kQueryIndexFaviconURL) || "";
-    let entryBookmarked = aRow.getResultByIndex(kQueryIndexBookmarked);
-    let entryBookmarkTitle = entryBookmarked ?
-      aRow.getResultByIndex(kQueryIndexBookmarkTitle) : null;
-    let entryTags = aRow.getResultByIndex(kQueryIndexTags) || "";
-
-    // Always prefer the bookmark title unless it is empty
-    let title = entryBookmarkTitle || entryTitle;
-
-    let style;
-    if (aRow.getResultByIndex(kQueryIndexQueryType) == kQueryTypeKeyword) {
-      style = "keyword";
-      title = NetUtil.newURI(escapedEntryURL).host;
-    }
-
-    // We will always prefer to show tags if we have them.
-    let showTags = !!entryTags;
-
-    // However, we'll act as if a page is not bookmarked if the user wants
-    // only history and not bookmarks and there are no tags.
-    if (this._hasBehavior("history") && !this._hasBehavior("bookmark") &&
-        !showTags) {
-      showTags = false;
-      style = "favicon";
-    }
-
-    // If we have tags and should show them, we need to add them to the title.
-    if (showTags) {
-      title += kTitleTagsSeparator + entryTags;
-    }
-    // We have to determine the right style to display.  Tags show the tag icon,
-    // bookmarks get the bookmark icon, and keywords get the keyword icon.  If
-    // the result does not fall into any of those, it just gets the favicon.
-    if (!style) {
-      // It is possible that we already have a style set (from a keyword
-      // search or because of the user's preferences), so only set it if we
-      // haven't already done so.
-      if (showTags) {
-        style = "tag";
-      }
-      else if (entryBookmarked) {
-        style = "bookmark";
-      }
-      else {
-        style = "favicon";
-      }
-    }
-
-    this._addToResults(entryId, url, title, entryFavicon, action + style);
-    return true;
-  },
-
-  /**
-   * Checks to see if the given place has already been added to the results.
-   *
-   * @param aPlaceId
-   *        The place id to check for, may be null.
-   * @param aUrl
-   *        The url to check for.
-   * @return true if the place has been added, false otherwise.
-   *
-   * @note Must check both the id and the url for a negative match, since
-   *       autocomplete may run in the middle of a new page addition.  In such
-   *       a case the switch-to-tab query would hash the page by url, then a
-   *       next query, running after the page addition, would hash it by id.
-   *       It's not possible to just rely on url though, since keywords
-   *       dynamically modify the url to include their search string.
-   */
-  _inResults: function PAC_inResults(aPlaceId, aUrl)
-  {
-    if (aPlaceId && aPlaceId in this._usedPlaces) {
-      return true;
-    }
-    return aUrl in this._usedPlaces;
-  },
-
-  /**
-   * Adds a result to the AutoComplete results.  Also tracks that we've added
-   * this place_id into the result set.
-   *
-   * @param aPlaceId
-   *        The place_id of the item to be added to the result set.  This is
-   *        used by _inResults.
-   * @param aURISpec
-   *        The URI spec for the entry.
-   * @param aTitle
-   *        The title to give the entry.
-   * @param aFaviconSpec
-   *        The favicon to give to the entry.
-   * @param aStyle
-   *        Indicates how the entry should be styled when displayed.
-   */
-  _addToResults: function PAC_addToResults(aPlaceId, aURISpec, aTitle,
-                                           aFaviconSpec, aStyle)
-  {
-    // Add this to our internal tracker to ensure duplicates do not end up in
-    // the result.  _usedPlaces is an Object that is being used as a set.
-    // Not all entries have a place id, thus we fallback to the url for them.
-    // We cannot use only the url since keywords entries are modified to
-    // include the search string, and would be returned multiple times.  Ids
-    // are faster too.
-    this._usedPlaces[aPlaceId || aURISpec] = true;
-
-    // Obtain the favicon for this URI.
-    let favicon;
-    if (aFaviconSpec) {
-      let uri = NetUtil.newURI(aFaviconSpec);
-      favicon = PlacesUtils.favicons.getFaviconLinkForIcon(uri).spec;
-    }
-    favicon = favicon || PlacesUtils.favicons.defaultFavicon.spec;
-
-    this._result.appendMatch(aURISpec, aTitle, favicon, aStyle);
-  },
-
-  /**
-   * Determines if the specified AutoComplete behavior is set.
-   *
-   * @param aType
-   *        The behavior type to test for.
-   * @return true if the behavior is set, false otherwise.
-   */
-  _hasBehavior: function PAC_hasBehavior(aType)
-  {
-    let behavior = Ci.mozIPlacesAutoComplete["BEHAVIOR_" + aType.toUpperCase()];
-
-    if (this._disablePrivateActions &&
-        behavior == Ci.mozIPlacesAutoComplete.BEHAVIOR_OPENPAGE) {
-      return false;
-    }
-
-    return this._behavior & behavior;
-  },
-
-  /**
-   * Enables the desired AutoComplete behavior.
-   *
-   * @param aType
-   *        The behavior type to set.
-   */
-  _setBehavior: function PAC_setBehavior(aType)
-  {
-    this._behavior |=
-      Ci.mozIPlacesAutoComplete["BEHAVIOR_" + aType.toUpperCase()];
-  },
-
-  /**
-   * Determines if we are done searching or not.
-   *
-   * @return true if we have completed searching, false otherwise.
-   */
-  isSearchComplete: function PAC_isSearchComplete()
-  {
-    // If _pendingQuery is null, we should no longer do any work since we have
-    // already called _finishSearch.  This means we completed our search.
-    return this._pendingQuery == null;
-  },
-
-  /**
-   * Determines if the given handle of a pending statement is a pending search
-   * or not.
-   *
-   * @param aHandle
-   *        A mozIStoragePendingStatement to check and see if we are waiting for
-   *        results from it still.
-   * @return true if it is a pending query, false otherwise.
-   */
-  isPendingSearch: function PAC_isPendingSearch(aHandle)
-  {
-    return this._pendingQuery == aHandle;
-  },
-
-  //////////////////////////////////////////////////////////////////////////////
-  //// nsISupports
-
-  classID: Components.ID("d0272978-beab-4adc-a3d4-04b76acfa4e7"),
-
-  _xpcom_factory: XPCOMUtils.generateSingletonFactory(nsPlacesAutoComplete),
-
-  QueryInterface: XPCOMUtils.generateQI([
-    Ci.nsIAutoCompleteSearch,
-    Ci.nsIAutoCompleteSimpleResultListener,
-    Ci.mozIPlacesAutoComplete,
-    Ci.mozIStorageStatementCallback,
-    Ci.nsIObserver,
-    Ci.nsISupportsWeakReference,
-  ])
-};
-
-var components = [nsPlacesAutoComplete];
-this.NSGetFactory = XPCOMUtils.generateNSGetFactory(components);
diff --git a/application/palemoon/components/places/nsPlacesAutoComplete.manifest b/application/palemoon/components/places/nsPlacesAutoComplete.manifest
deleted file mode 100644
index 77dc732af..000000000
--- a/application/palemoon/components/places/nsPlacesAutoComplete.manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-component {d0272978-beab-4adc-a3d4-04b76acfa4e7} nsPlacesAutoComplete.js
-contract @mozilla.org/autocomplete/search;1?name=history {d0272978-beab-4adc-a3d4-04b76acfa4e7}
-
-- 
cgit v1.2.3