Move overlay magic from util to overlay module.

common/content/browser.js

@@ -13,8 +13,8 @@
  */
 var Browser = Module("browser", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
     init: function init() {
-        this.cleanupProgressListener = util.overlayObject(window.XULBrowserWindow,
-                                                          this.progressListener);
+        this.cleanupProgressListener = overlay.overlayObject(window.XULBrowserWindow,
+                                                             this.progressListener);
         util.addObserver(this);
     },
 

common/content/commandline.js

@@ -15,7 +15,7 @@ var CommandWidgets = Class("CommandWidgets", {
         let s = "dactyl-statusline-field-";
 
         XML.ignoreWhitespace = true;
-        util.overlayWindow(window, {
+        overlay.overlayWindow(window, {
             objects: {
                 eventTarget: commandline
             },

common/content/dactyl.js

@@ -40,7 +40,7 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
         styles.registerSheet("resource://dactyl-skin/dactyl.css");
 
         this.cleanups = [];
-        this.cleanups.push(util.overlayObject(window, {
+        this.cleanups.push(overlay.overlayObject(window, {
             focusAndSelectUrlBar: function focusAndSelectUrlBar() {
                 switch (options.get("strictfocus").getKey(document.documentURIObject || util.newURI(document.documentURI), "moderate")) {
                 case "laissez-faire":
@@ -305,7 +305,7 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
             };
             XML.ignoreWhitespace = true;
             if (!elems.bell)
-                util.overlayWindow(window, {
+                overlay.overlayWindow(window, {
                     objects: elems,
                     prepend: <>
                         <window id={document.documentElement.id} xmlns={XUL}>

common/content/events.js

@@ -410,7 +410,7 @@ var Events = Module("events", {
         EventHive.prototype.wrapListener = this.closure.wrapListener;
 
         XML.ignoreWhitespace = true;
-        util.overlayWindow(window, {
+        overlay.overlayWindow(window, {
             append: <e4x xmlns={XUL}>
                 <window id={document.documentElement.id}>
                     <!-- http://developer.mozilla.org/en/docs/XUL_Tutorial:Updating_Commands -->

common/content/mow.js

@@ -44,7 +44,7 @@ var MOW = Module("mow", {
                           true);
 
         XML.ignoreWhitespace = true;
-        util.overlayWindow(window, {
+        overlay.overlayWindow(window, {
             objects: {
                 eventTarget: this
             },

common/content/statusline.js

@@ -23,7 +23,7 @@ var StatusLine = Module("statusline", {
                 #addon-bar > xul|toolbarspring { visibility: collapse; }
             ]]></css>);
 
-            util.overlayWindow(window, { append: <><statusbar id="status-bar" ordinal="0"/></> });
+            overlay.overlayWindow(window, { append: <><statusbar id="status-bar" ordinal="0"/></> });
 
             highlight.loadCSS(util.compileMacro(<![CDATA[
                 !AddonBar;#addon-bar {
@@ -83,7 +83,7 @@ var StatusLine = Module("statusline", {
         for each (let attr in prepend..@key)
             attr.parent().@id = "dactyl-statusline-field-" + attr;
 
-        util.overlayWindow(window, {
+        overlay.overlayWindow(window, {
             objects: this.widgets = { get status() this.container },
             prepend: prepend.elements()
         });