Bug 1442961 - Remove the windowdragbox element and binding. r=jaws

MozReview-Commit-ID: JZVMty8qMCP

browser/base/content/browser.css

@@ -291,7 +291,6 @@ window:not([chromehidden~="toolbar"]) #nav-bar[nonemptyoverflow] > .overflow-but
 }
 
 #titlebar {
-  -moz-binding: url("chrome://global/content/bindings/general.xml#windowdragbox");
   -moz-window-dragging: drag;
 }
 

browser/base/content/browser.js

@@ -1387,9 +1387,8 @@ var gBrowserInit = {
   },
 
   _delayedStartup() {
-    let tmp = {};
-    ChromeUtils.import("resource://gre/modules/TelemetryTimestamps.jsm", tmp);
-    let TelemetryTimestamps = tmp.TelemetryTimestamps;
+    let { TelemetryTimestamps } =
+      ChromeUtils.import("resource://gre/modules/TelemetryTimestamps.jsm", {});
     TelemetryTimestamps.add("delayedStartupStarted");
 
     this._cancelDelayedStartup();
@@ -1544,6 +1543,12 @@ var gBrowserInit = {
     gNavToolbox.addEventListener("customizationstarting", CustomizationHandler);
     gNavToolbox.addEventListener("customizationending", CustomizationHandler);
 
+    if (AppConstants.platform == "linux") {
+      let { WindowDraggingElement } =
+        ChromeUtils.import("resource://gre/modules/WindowDraggingUtils.jsm", {});
+      new WindowDraggingElement(document.getElementById("titlebar"));
+    }
+
     SessionStore.promiseInitialized.then(() => {
       // Bail out if the window has been closed in the meantime.
       if (window.closed) {

browser/base/content/pageinfo/pageInfo.xul

@@ -69,7 +69,7 @@
     <menuitem id="menu_copy"      label="&copy.label;"      command="cmd_copy"      accesskey="&copy.accesskey;"/>
   </menupopup>
 
-  <windowdragbox id="topBar" class="viewGroupWrapper">
+  <vbox id="topBar">
     <radiogroup id="viewGroup" class="chromeclass-toolbar" orient="horizontal">
       <radio id="generalTab"  label="&generalTab;"  accesskey="&generalTab.accesskey;"
            oncommand="showTab('general');"/>
@@ -82,7 +82,7 @@
       <radio id="securityTab" label="&securityTab;" accesskey="&securityTab.accesskey;"
            oncommand="showTab('security');"/>
     </radiogroup>
-  </windowdragbox>
+  </vbox>
 
   <deck id="mainDeck" flex="1">
     <!-- General page information -->

browser/themes/osx/pageInfo.css

@@ -8,9 +8,7 @@
 
 #topBar {
   -moz-appearance: toolbar;
-}
-
-.viewGroupWrapper {
+  -moz-window-dragging: drag;
   -moz-box-align: center;
   -moz-box-pack: center;
 }

browser/themes/windows/browser.css

@@ -185,8 +185,8 @@
   }
 
   #main-window[tabsintitlebar] #titlebar-content:-moz-lwtheme {
-    -moz-binding: url("chrome://global/content/bindings/general.xml#windowdragbox");
     visibility: visible;
+    -moz-window-dragging: drag;
   }
 
   /* Top-level menu appearance has transparent background, so the text color

browser/themes/windows/pageInfo.css

@@ -4,6 +4,14 @@
 
 @import "chrome://global/skin/";
 
+#topBar {
+  -moz-window-dragging: drag;
+  border-bottom: 1px solid ThreeDLightShadow;
+  padding-inline-start: 10px;
+  background-color: -moz-Field;
+  color: -moz-FieldText;
+}
+
 /* View buttons */
 #viewGroup {
   padding-inline-start: 10px;
@@ -32,13 +40,6 @@
   padding: 0 6px;
 }
 
-#topBar {
-  border-bottom: 1px solid ThreeDLightShadow;
-  padding-inline-start: 10px;
-  background-color: -moz-Field;
-  color: -moz-FieldText;
-}
-
 #generalTab {
   -moz-image-region: rect(0px, 32px, 32px, 0px)
 }

toolkit/content/widgets/general.xml

@@ -123,23 +123,4 @@
     </content>
   </binding>
 
-  <binding id="windowdragbox">
-    <implementation>
-      <field name="_dragBindingAlive">true</field>
-      <constructor>
-        if (!this._draggableStarted) {
-          this._draggableStarted = true;
-          try {
-            let tmp = {};
-            ChromeUtils.import("resource://gre/modules/WindowDraggingUtils.jsm", tmp);
-            let draghandle = new tmp.WindowDraggingElement(this);
-            draghandle.mouseDownCheck = function() {
-              return this._dragBindingAlive;
-            };
-          } catch (e) {}
-        }
-      </constructor>
-    </implementation>
-  </binding>
-
 </bindings>

toolkit/content/xul.css

@@ -255,11 +255,10 @@ caption {
 
 %ifndef MOZ_WIDGET_GTK
 titlebar,
-toolbar:not([nowindowdrag="true"]):not([customizing="true"]),
-%endif
-windowdragbox {
+toolbar:not([nowindowdrag="true"]):not([customizing="true"]) {
   -moz-window-dragging: drag;
 }
+%endif
 
 /* The list below is non-comprehensive and will probably need some tweaking. */
 toolbaritem,