Bug 1520630 - Remove XUL grid from browser/components/preferences/in-content/privacy.xul. r=jaws
authorTim Nguyen <ntim.bugs@gmail.com>
Wed, 16 Jan 2019 22:26:01 +0000
changeset 511269 4634c5b819f31f0a5d78bd3c5013f432d4f97dc0
parent 511268 3f880d838bb0e5cb3e318dc94acd08c8387245f7
child 511270 f59ff936f6a2154c2048b5bf397c4751a3a593b5
push id10547
push userffxbld-merge
push dateMon, 21 Jan 2019 13:03:58 +0000
treeherdermozilla-beta@24ec1916bffe [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjaws
bugs1520630
milestone66.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1520630 - Remove XUL grid from browser/components/preferences/in-content/privacy.xul. r=jaws Differential Revision: https://phabricator.services.mozilla.com/D16753
browser/components/preferences/in-content/privacy.xul
--- a/browser/components/preferences/in-content/privacy.xul
+++ b/browser/components/preferences/in-content/privacy.xul
@@ -445,120 +445,115 @@
       data-category="panePrivacy">
   <html:h1 data-l10n-id="permissions-header"/>
 </hbox>
 
 <!-- Permissions -->
 <groupbox id="permissionsGroup" data-category="panePrivacy" hidden="true" data-subcategory="permissions">
   <label class="search-header" hidden="true"><html:h2 data-l10n-id="permissions-header"/></label>
 
-  <grid>
-    <columns>
-      <column flex="1"/>
-      <column/>
-    </columns>
-    <rows>
-      <row id="locationSettingsRow" align="center" role="group" aria-labelledby="locationPermissionsLabel">
-        <description flex="1">
-          <image class="geo-icon permission-icon" />
-          <separator orient="vertical" class="thin"/>
-          <label id="locationPermissionsLabel" data-l10n-id="permissions-location"/>
-        </description>
-        <hbox pack="end">
-          <button id="locationSettingsButton"
-                  class="accessory-button"
-                  data-l10n-id="permissions-location-settings"
-                  search-l10n-ids="
-                    permissions-remove.label,
-                    permissions-remove-all.label,
-                    permissions-button-cancel.label,
-                    permissions-button-ok.label,
-                    permissions-site-location-window.title,
-                    permissions-site-location-desc,
-                    permissions-site-location-disable-label,
-                    permissions-site-location-disable-desc,
-                  " />
-        </hbox>
-      </row>
+  <!-- The hbox around the buttons is to compute the search tooltip position properly -->
+  <vbox>
+    <hbox id="locationSettingsRow" align="center" role="group" aria-labelledby="locationPermissionsLabel">
+      <description flex="1">
+        <image class="geo-icon permission-icon" />
+        <separator orient="vertical" class="thin"/>
+        <label id="locationPermissionsLabel" data-l10n-id="permissions-location"/>
+      </description>
+      <hbox pack="end">
+        <button id="locationSettingsButton"
+                class="accessory-button"
+                data-l10n-id="permissions-location-settings"
+                search-l10n-ids="
+                  permissions-remove.label,
+                  permissions-remove-all.label,
+                  permissions-button-cancel.label,
+                  permissions-button-ok.label,
+                  permissions-site-location-window.title,
+                  permissions-site-location-desc,
+                  permissions-site-location-disable-label,
+                  permissions-site-location-disable-desc,
+                " />
+      </hbox>
+    </hbox>
 
-      <row id="cameraSettingsRow" align="center" role="group" aria-labelledby="cameraPermissionsLabel">
-        <description flex="1">
-          <image class="camera-icon permission-icon" />
-          <separator orient="vertical" class="thin"/>
-          <label id="cameraPermissionsLabel" data-l10n-id="permissions-camera"/>
-        </description>
-        <hbox pack="end">
-          <button id="cameraSettingsButton"
-                  class="accessory-button"
-                  data-l10n-id="permissions-camera-settings"
-                  search-l10n-ids="
-                    permissions-remove.label,
-                    permissions-remove-all.label,
-                    permissions-button-cancel.label,
-                    permissions-button-ok.label,
-                    permissions-site-camera-window.title,
-                    permissions-site-camera-desc,
-                    permissions-site-camera-disable-label,
-                    permissions-site-camera-disable-desc,
-                  " />
-        </hbox>
-      </row>
+    <hbox id="cameraSettingsRow" align="center" role="group" aria-labelledby="cameraPermissionsLabel">
+      <description flex="1">
+        <image class="camera-icon permission-icon" />
+        <separator orient="vertical" class="thin"/>
+        <label id="cameraPermissionsLabel" data-l10n-id="permissions-camera"/>
+      </description>
+      <hbox pack="end">
+        <button id="cameraSettingsButton"
+                class="accessory-button"
+                data-l10n-id="permissions-camera-settings"
+                search-l10n-ids="
+                  permissions-remove.label,
+                  permissions-remove-all.label,
+                  permissions-button-cancel.label,
+                  permissions-button-ok.label,
+                  permissions-site-camera-window.title,
+                  permissions-site-camera-desc,
+                  permissions-site-camera-disable-label,
+                  permissions-site-camera-disable-desc,
+                " />
+      </hbox>
+    </hbox>
 
-      <row id="microphoneSettingsRow" align="center" role="group" aria-labelledby="microphonePermissionsLabel">
-        <description flex="1">
-          <image class="microphone-icon permission-icon" />
-          <separator orient="vertical" class="thin"/>
-          <label id="microphonePermissionsLabel" data-l10n-id="permissions-microphone"/>
-        </description>
-        <hbox pack="end">
-          <button id="microphoneSettingsButton"
-                  class="accessory-button"
-                  data-l10n-id="permissions-microphone-settings"
-                  search-l10n-ids="
-                    permissions-remove.label,
-                    permissions-remove-all.label,
-                    permissions-button-cancel.label,
-                    permissions-button-ok.label,
-                    permissions-site-microphone-window.title,
-                    permissions-site-microphone-desc,
-                    permissions-site-microphone-disable-label,
-                    permissions-site-microphone-disable-desc,
-                  " />
-        </hbox>
-      </row>
+    <hbox id="microphoneSettingsRow" align="center" role="group" aria-labelledby="microphonePermissionsLabel">
+      <description flex="1">
+        <image class="microphone-icon permission-icon" />
+        <separator orient="vertical" class="thin"/>
+        <label id="microphonePermissionsLabel" data-l10n-id="permissions-microphone"/>
+      </description>
+      <hbox pack="end">
+        <button id="microphoneSettingsButton"
+                class="accessory-button"
+                data-l10n-id="permissions-microphone-settings"
+                search-l10n-ids="
+                  permissions-remove.label,
+                  permissions-remove-all.label,
+                  permissions-button-cancel.label,
+                  permissions-button-ok.label,
+                  permissions-site-microphone-window.title,
+                  permissions-site-microphone-desc,
+                  permissions-site-microphone-disable-label,
+                  permissions-site-microphone-disable-desc,
+                " />
+      </hbox>
+    </hbox>
 
-      <row id="notificationSettingsRow" align="center" role="group" aria-labelledby="notificationPermissionsLabel">
-        <description flex="1">
-          <image class="desktop-notification-icon permission-icon" />
-          <separator orient="vertical" class="thin"/>
-          <label id="notificationPermissionsLabel"
-                 class="tail-with-learn-more"
-                 data-l10n-id="permissions-notification"/>
-          <label id="notificationPermissionsLearnMore"
-                 class="learnMore text-link"
-                 data-l10n-id="permissions-notification-link"/>
-        </description>
-        <hbox pack="end">
-          <button id="notificationSettingsButton"
-                  class="accessory-button"
-                  data-l10n-id="permissions-notification-settings"
-                  search-l10n-ids="
-                    permissions-remove.label,
-                    permissions-remove-all.label,
-                    permissions-button-cancel.label,
-                    permissions-button-ok.label,
-                    permissions-site-notification-window.title,
-                    permissions-site-notification-desc,
-                    permissions-site-notification-disable-label,
-                    permissions-site-notification-disable-desc,
-                  " />
-        </hbox>
-      </row>
-    </rows>
-  </grid>
+    <hbox id="notificationSettingsRow" align="center" role="group" aria-labelledby="notificationPermissionsLabel">
+      <description flex="1">
+        <image class="desktop-notification-icon permission-icon" />
+        <separator orient="vertical" class="thin"/>
+        <label id="notificationPermissionsLabel"
+               class="tail-with-learn-more"
+               data-l10n-id="permissions-notification"/>
+        <label id="notificationPermissionsLearnMore"
+               class="learnMore text-link"
+               data-l10n-id="permissions-notification-link"/>
+      </description>
+      <hbox pack="end">
+        <button id="notificationSettingsButton"
+                class="accessory-button"
+                data-l10n-id="permissions-notification-settings"
+                search-l10n-ids="
+                  permissions-remove.label,
+                  permissions-remove-all.label,
+                  permissions-button-cancel.label,
+                  permissions-button-ok.label,
+                  permissions-site-notification-window.title,
+                  permissions-site-notification-desc,
+                  permissions-site-notification-disable-label,
+                  permissions-site-notification-disable-desc,
+                " />
+      </hbox>
+    </hbox>
+  </vbox>
 
   <vbox id="notificationsDoNotDisturbBox" hidden="true">
     <checkbox id="notificationsDoNotDisturb" class="indent"/>
   </vbox>
 
   <separator flex="1"/>
 
   <hbox align="start" id="autoplayMediaCheckboxWrapper">