diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2018-02-11 07:03:16 -0500 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2018-02-11 07:03:16 -0500 |
| commit | 203eb0f61a09372310a2a8fb57e169cb3f47800b (patch) | |
| tree | 8490329d3dae4de3c7ffd127bce1f65fdc009abd /browser/base/content | |
| parent | e45706ca3acbb6530419433212becc61d5953a2d (diff) | |
| parent | 8f6d3dab81c7f8f97ef197e26ab9439b09735b8f (diff) | |
| download | UXP-203eb0f61a09372310a2a8fb57e169cb3f47800b.tar UXP-203eb0f61a09372310a2a8fb57e169cb3f47800b.tar.gz UXP-203eb0f61a09372310a2a8fb57e169cb3f47800b.tar.lz UXP-203eb0f61a09372310a2a8fb57e169cb3f47800b.tar.xz UXP-203eb0f61a09372310a2a8fb57e169cb3f47800b.zip | |
Merge branch 'ext-work'FF_Checkpoint_1
Diffstat (limited to 'browser/base/content')
| -rw-r--r-- | browser/base/content/tab-content.js | 4 | ||||
| -rw-r--r-- | browser/base/content/urlbarBindings.xml | 7 |
2 files changed, 10 insertions, 1 deletions
diff --git a/browser/base/content/tab-content.js b/browser/base/content/tab-content.js index 06fa3d9cc..05f8e00ab 100644 --- a/browser/base/content/tab-content.js +++ b/browser/base/content/tab-content.js @@ -9,7 +9,9 @@ var {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components; Cu.import("resource://gre/modules/XPCOMUtils.jsm"); Cu.import("resource://gre/modules/Services.jsm"); +#ifdef MOZ_WEBEXTENSIONS Cu.import("resource://gre/modules/ExtensionContent.jsm"); +#endif XPCOMUtils.defineLazyModuleGetter(this, "E10SUtils", "resource:///modules/E10SUtils.jsm"); @@ -929,11 +931,13 @@ var UserContextIdNotifier = { UserContextIdNotifier.init(); +#ifdef MOZ_WEBEXTENSIONS ExtensionContent.init(this); addEventListener("unload", () => { ExtensionContent.uninit(this); RefreshBlocker.uninit(); }); +#endif addMessageListener("AllowScriptsToClose", () => { content.QueryInterface(Ci.nsIInterfaceRequestor) 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[ |