Backed out changeset 8d77e66558eb (bug 881436) for not including [Australis] in the commit message.
authorJared Wein <jwein@mozilla.com>
Tue, 17 Dec 2013 22:20:26 -0500
changeset 161005 6fe98df05b224edad2d3510771c02067b9504ba2
parent 161004 8d77e66558eb66d10b323c8efd48193e96736e85
child 161006 65ea9623a54f7c37ece03dbebfbc316fff1220ac
push id3372
push usercbook@mozilla.com
push dateWed, 18 Dec 2013 12:06:28 +0000
treeherderb2g-inbound@0758d09c0962 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs881436
milestone29.0a1
backs out8d77e66558eb66d10b323c8efd48193e96736e85
Backed out changeset 8d77e66558eb (bug 881436) for not including [Australis] in the commit message.
browser/components/customizableui/content/panelUI.inc.xul
browser/locales/en-US/chrome/browser/browser.dtd
browser/themes/shared/customizableui/panelUIOverlay.inc.css
--- a/browser/components/customizableui/content/panelUI.inc.xul
+++ b/browser/components/customizableui/content/panelUI.inc.xul
@@ -31,22 +31,16 @@
                        tooltiptext="&quitApplicationCmd.label;"
 #endif
                        command="cmd_quitApplication"/>
       </footer>
     </panelview>
 
     <panelview id="PanelUI-history" flex="1">
       <label value="&appMenuHistory.label;"/>
-      <toolbarbutton id="appMenuViewHistorySidebar" tabindex="0"
-                     label="&appMenuHistory.viewSidebar.label;"
-                     type="checkbox"
-                     oncommand="toggleSidebar('viewHistorySidebar'); PanelUI.hide();">
-        <observes element="viewHistorySidebar" attribute="checked"/>
-      </toolbarbutton>
       <toolbarbutton id="appMenuClearRecentHistory" tabindex="0"
                      label="&appMenuHistory.clearRecent.label;"
                      command="Tools:Sanitize"/>
       <toolbarbutton id="appMenuRestoreLastSession" tabindex="0"
                      label="&appMenuHistory.restoreSession.label;"
                      command="Browser:RestoreLastSession"/>
       <menuseparator id="PanelUI-recentlyClosedTabs-separator"/>
       <vbox id="PanelUI-recentlyClosedTabs" tooltip="bhTooltip"/>
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -323,17 +323,16 @@ These should match what Safari and other
 <!ENTITY showAllHistoryCmd.commandkey "H">
 
 <!ENTITY appMenuCustomize.label "Customize">
 <!ENTITY appMenuCustomizeExit.label "Exit Customize">
 <!ENTITY appMenuHistory.label "History">
 <!ENTITY appMenuHistory.showAll.label "Show All History">
 <!ENTITY appMenuHistory.clearRecent.label "Clear Recent History…">
 <!ENTITY appMenuHistory.restoreSession.label "Restore Previous Session">
-<!ENTITY appMenuHistory.viewSidebar.label "View History Sidebar">
 
 <!ENTITY customizeMenu.addToToolbar.label "Add to Toolbar">
 <!ENTITY customizeMenu.addToToolbar.accesskey "A">
 <!ENTITY customizeMenu.addToPanel.label "Add to Menu">
 <!ENTITY customizeMenu.addToPanel.accesskey "M">
 <!ENTITY customizeMenu.moveToToolbar.label "Move to Toolbar">
 <!ENTITY customizeMenu.moveToToolbar.accesskey "M">
 <!ENTITY customizeMenu.moveToPanel.label "Move to Menu">
--- a/browser/themes/shared/customizableui/panelUIOverlay.inc.css
+++ b/browser/themes/shared/customizableui/panelUIOverlay.inc.css
@@ -514,41 +514,37 @@ toolbarpaletteitem[place="palette"] > #s
 
 #widget-overflow-list > #edit-controls,
 #widget-overflow-list > #zoom-controls {
   min-height: 28px;
 }
 
 #PanelUI-developerItems > toolbarbutton[checked="true"],
 #PanelUI-bookmarks > toolbarbutton[checked="true"],
-#PanelUI-history > toolbarbutton[checked="true"],
 .PanelUI-characterEncodingView-list > toolbarbutton[current] {
   -moz-padding-start: 4px;
 }
 
 #PanelUI-developerItems > toolbarbutton[checked="true"] > .toolbarbutton-text,
 #PanelUI-bookmarks > toolbarbutton[checked="true"] > .toolbarbutton-text,
-#PanelUI-history > toolbarbutton[checked="true"] > .toolbarbutton-text,
 .PanelUI-characterEncodingView-list > toolbarbutton[current] > .toolbarbutton-text,
 #customizationui-widget-panel .PanelUI-characterEncodingView-list > toolbarbutton[current] > .toolbarbutton-text {
   -moz-padding-start: 0px;
 }
 
 #BMB_bookmarksPopup > menuitem[checked="true"]::before,
 #PanelUI-bookmarks > toolbarbutton[checked="true"]::before,
-#PanelUI-history > toolbarbutton[checked="true"]::before,
 #PanelUI-developerItems > toolbarbutton[checked="true"]::before,
 .PanelUI-characterEncodingView-list > toolbarbutton[current]::before {
   content: "✓";
   display: -moz-box;
   width: 12px;
 }
 
 #PanelUI-bookmarks > toolbarbutton[checked="true"]::before,
-#PanelUI-history > toolbarbutton[checked="true"]::before,
 #PanelUI-developerItems > toolbarbutton[checked="true"]::before,
 .PanelUI-characterEncodingView-list > toolbarbutton[current]::before {
   -moz-margin-end: -2px;
 }
 
 #BMB_bookmarksPopup > menuitem[checked="true"] > .menu-iconic-left {
   display: none;
 }