From 14bfaf641a10699258070219fec13d48c56d2e62 Mon Sep 17 00:00:00 2001
From: "Matt A. Tobin" <email@mattatobin.com>
Date: Sun, 11 Feb 2018 06:56:30 -0500
Subject: Make Basilisk function without WebExtensions

---
 browser/base/content/urlbarBindings.xml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'browser/base/content/urlbarBindings.xml')

diff --git a/browser/base/content/urlbarBindings.xml b/browser/base/content/urlbarBindings.xml
index 689c7c5a7..eb3150581 100644
--- a/browser/base/content/urlbarBindings.xml
+++ b/browser/base/content/urlbarBindings.xml
@@ -56,10 +56,11 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/.
       <field name="AppConstants" readonly="true">
         (Components.utils.import("resource://gre/modules/AppConstants.jsm", {})).AppConstants;
       </field>
-
+#ifdef MOZ_WEBEXTENSIONS
       <field name="ExtensionSearchHandler" readonly="true">
         (Components.utils.import("resource://gre/modules/ExtensionSearchHandler.jsm", {})).ExtensionSearchHandler;
       </field>
+#endif
 
       <constructor><![CDATA[
         this._prefs = Components.classes["@mozilla.org/preferences-service;1"]
@@ -487,6 +488,7 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/.
                   actionDetails
                 );
                 break;
+#ifdef MOZ_WEBEXTENSIONS
               case "extension":
                 this.handleRevert();
                 // Give the extension control of handling the command.
@@ -494,6 +496,7 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/.
                 let keyword = action.params.keyword;
                 this.ExtensionSearchHandler.handleInputEntered(keyword, searchString, where);
                 return;
+#endif
             }
           } else {
             // This is a fallback for add-ons and old testing code that directly
@@ -1211,9 +1214,11 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/.
           this._clearNoActions();
           this.formatValue();
         }
+#ifdef MOZ_WEBEXTENSIONS
         if (ExtensionSearchHandler.hasActiveInputSession()) {
           ExtensionSearchHandler.handleInputCancelled();
         }
+#endif
       ]]></handler>
 
       <handler event="dragstart" phase="capturing"><![CDATA[
-- 
cgit v1.2.3