Bug 1146269 - Move the identity panel to its own XUL file in browser/components/controlcenter/ r=Gijs,ted
authorTim Taubert <ttaubert@mozilla.com>
Wed, 27 May 2015 14:10:49 +0200
changeset 269628 c3607a49752e432cc3528479cf49447b82e6fef8
parent 269627 4017f25a873397e2a8b4835eda4c7d93b8694004
child 269629 cbfa5a6f0804bd60c656b903fbed15856a23e2e0
push id2540
push userwcosta@mozilla.com
push dateWed, 03 Jun 2015 20:55:41 +0000
reviewersGijs, ted
bugs1146269
milestone41.0a1
Bug 1146269 - Move the identity panel to its own XUL file in browser/components/controlcenter/ r=Gijs,ted
browser/base/content/browser.xul
browser/components/controlcenter/content/panel.inc.xul
browser/components/moz.build
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -401,77 +401,16 @@
                               gContextMenu.hiding();
                               gContextMenu = null;
                               updateEditUIVisibility();">
 #include browser-context.inc
     </menupopup>
 
     <menupopup id="placesContext"/>
 
-    <!-- Popup for site identity information -->
-    <panel id="identity-popup"
-           type="arrow"
-           hidden="true"
-           noautofocus="true"
-           onpopupshown="if (event.target == this)
-                           gIdentityHandler.onPopupShown(event);"
-           orient="vertical"
-           level="top">
-      <hbox id="identity-popup-container" align="top">
-        <image id="identity-popup-icon"/>
-        <vbox id="identity-popup-content-box">
-          <label id="identity-popup-brandName"
-                 class="identity-popup-label"
-                 value="&brandFullName;"/>
-          <label id="identity-popup-chromeLabel"
-                 class="identity-popup-label"/>
-          <label id="identity-popup-connectedToLabel"
-                 class="identity-popup-label"
-                 value="&identity.connectedTo;"/>
-          <label id="identity-popup-connectedToLabel2"
-                 class="identity-popup-label"
-                 value="&identity.unverifiedsite2;"/>
-          <description id="identity-popup-content-host"
-                       class="identity-popup-description"/>
-          <label id="identity-popup-runByLabel"
-                 class="identity-popup-label"
-                 value="&identity.runBy;"/>
-          <description id="identity-popup-content-owner"
-                       class="identity-popup-description"/>
-          <description id="identity-popup-content-supplemental"
-                       class="identity-popup-description"/>
-          <description id="identity-popup-content-verifier"
-                       class="identity-popup-description"/>
-          <hbox id="identity-popup-encryption" flex="1">
-            <vbox>
-              <image id="identity-popup-encryption-icon"/>
-            </vbox>
-            <description id="identity-popup-encryption-label" flex="1"
-                         class="identity-popup-description"/>
-          </hbox>
-          <vbox id="identity-popup-permissions">
-            <separator class="thin"/>
-            <label class="identity-popup-label header"
-                   value="&identity.permissions;"/>
-            <vbox id="identity-popup-permission-list" class="indent"/>
-          </vbox>
-        </vbox>
-      </hbox>
-      <!-- Footer button to open security page info -->
-      <hbox id="identity-popup-button-container" align="center">
-        <button id="identity-popup-help-icon"
-               oncommand="gIdentityHandler.handleHelpCommand(event);"
-               tooltiptext="&identity.help.tooltip;"/>
-        <spacer flex="1"/>
-        <button id="identity-popup-more-info-button"
-                label="&identity.moreInfoLinkText;"
-                oncommand="gIdentityHandler.handleMoreInfoClick(event);"/>
-      </hbox>
-    </panel>
-
     <panel id="ctrlTab-panel" class="KUI-panel" hidden="true" norestorefocus="true" level="top">
       <hbox>
         <button class="ctrlTab-preview" flex="1"/>
         <button class="ctrlTab-preview" flex="1"/>
         <button class="ctrlTab-preview" flex="1"/>
         <button class="ctrlTab-preview" flex="1"/>
         <button class="ctrlTab-preview" flex="1"/>
         <button class="ctrlTab-preview" flex="1"/>
@@ -544,16 +483,17 @@
     <tooltip id="share-button-tooltip" onpopupshowing="SocialShare.createTooltip(event);">
       <label class="tooltip-label"/>
       <label class="tooltip-label"/>
     </tooltip>
 
 #include popup-notifications.inc
 
 #include ../../components/customizableui/content/panelUI.inc.xul
+#include ../../components/controlcenter/content/panel.inc.xul
 
     <hbox id="downloads-animation-container" mousethrough="always">
       <vbox id="downloads-notification-anchor">
         <vbox id="downloads-indicator-notification"/>
       </vbox>
     </hbox>
 
     <hbox id="bookmarked-notification-container" mousethrough="always">
new file mode 100644
--- /dev/null
+++ b/browser/components/controlcenter/content/panel.inc.xul
@@ -0,0 +1,63 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<panel id="identity-popup"
+       type="arrow"
+       hidden="true"
+       noautofocus="true"
+       onpopupshown="if (event.target == this)
+                       gIdentityHandler.onPopupShown(event);"
+       orient="vertical"
+       level="top">
+  <hbox id="identity-popup-container" align="top">
+    <image id="identity-popup-icon"/>
+    <vbox id="identity-popup-content-box">
+      <label id="identity-popup-brandName"
+             class="identity-popup-label"
+             value="&brandFullName;"/>
+      <label id="identity-popup-chromeLabel"
+             class="identity-popup-label"/>
+      <label id="identity-popup-connectedToLabel"
+             class="identity-popup-label"
+             value="&identity.connectedTo;"/>
+      <label id="identity-popup-connectedToLabel2"
+             class="identity-popup-label"
+             value="&identity.unverifiedsite2;"/>
+      <description id="identity-popup-content-host"
+                   class="identity-popup-description"/>
+      <label id="identity-popup-runByLabel"
+             class="identity-popup-label"
+             value="&identity.runBy;"/>
+      <description id="identity-popup-content-owner"
+                   class="identity-popup-description"/>
+      <description id="identity-popup-content-supplemental"
+                   class="identity-popup-description"/>
+      <description id="identity-popup-content-verifier"
+                   class="identity-popup-description"/>
+      <hbox id="identity-popup-encryption" flex="1">
+        <vbox>
+          <image id="identity-popup-encryption-icon"/>
+        </vbox>
+        <description id="identity-popup-encryption-label" flex="1"
+                     class="identity-popup-description"/>
+      </hbox>
+      <vbox id="identity-popup-permissions">
+        <separator class="thin"/>
+        <label class="identity-popup-label header"
+               value="&identity.permissions;"/>
+        <vbox id="identity-popup-permission-list" class="indent"/>
+      </vbox>
+    </vbox>
+  </hbox>
+  <!-- Footer button to open security page info -->
+  <hbox id="identity-popup-button-container" align="center">
+    <button id="identity-popup-help-icon"
+           oncommand="gIdentityHandler.handleHelpCommand(event);"
+           tooltiptext="&identity.help.tooltip;"/>
+    <spacer flex="1"/>
+    <button id="identity-popup-more-info-button"
+            label="&identity.moreInfoLinkText;"
+            oncommand="gIdentityHandler.handleMoreInfoClick(event);"/>
+  </hbox>
+</panel>
--- a/browser/components/moz.build
+++ b/browser/components/moz.build
@@ -49,8 +49,11 @@ BROWSER_CHROME_MANIFESTS += [
     'test/browser.ini'
 ]
 
 if CONFIG['MOZ_SAFE_BROWSING']:
     BROWSER_CHROME_MANIFESTS += ['safebrowsing/content/test/browser.ini']
 
 with Files('safebrowsing/*'):
     BUG_COMPONENT = ('Toolkit', 'Phishing Protection')
+
+with Files('controlcenter/**'):
+    BUG_COMPONENT = ('Firefox', 'General')