[tor-commits] [tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 26321: New Circuit and New Identity menu items

[gk at torproject.org]

commit 9eef59c878e596b64efff9eafb0cc4bcc38f680c
Author: Arthur Edelstein <arthuredelstein at gmail.com>
Date:   Fri Jun 22 23:56:44 2018 -0700

    Bug 26321: New Circuit and New Identity menu items
    
    Placeholder menu items whose labels and commands
    are overridden by torbutton patch 26321.
---
 browser/base/content/browser-menubar.inc                  | 7 +++++++
 browser/components/customizableui/content/panelUI.inc.xul | 8 ++++++++
 2 files changed, 15 insertions(+)

diff --git a/browser/base/content/browser-menubar.inc b/browser/base/content/browser-menubar.inc
index bbae987196c7..f10fc2f4072d 100644
--- a/browser/base/content/browser-menubar.inc
+++ b/browser/base/content/browser-menubar.inc
@@ -34,6 +34,13 @@
                           accesskey="&newPrivateWindow.accesskey;"
                           command="Tools:PrivateBrowsing"
                           key="key_privatebrowsing"/>
+                <menuseparator/>
+                <!-- To be modified by torbutton 26321 -->
+                <menuitem id="menu_newIdentity"
+                          label="New Identity"/>
+                <menuitem id="menu_newCircuit"
+                          label="New Tor Circuit for this Site"/>
+                <menuseparator/>
 #ifdef MAC_NON_BROWSER_WINDOW
                 <menuitem id="menu_openLocation"
                           label="&openLocationCmd.label;"
diff --git a/browser/components/customizableui/content/panelUI.inc.xul b/browser/components/customizableui/content/panelUI.inc.xul
index e44330108bb9..3aab2fd2587d 100644
--- a/browser/components/customizableui/content/panelUI.inc.xul
+++ b/browser/components/customizableui/content/panelUI.inc.xul
@@ -217,6 +217,14 @@
                        class="subviewbutton subviewbutton-iconic"
                        command="Browser:RestoreLastSession"/>
         <toolbarseparator/>
+        <!-- To be modified by torbutton #26321 -->
+        <toolbarbutton id="appMenuNewIdentity"
+                       label="New Identity"
+                       class="subviewbutton subviewbutton-iconic"/>
+        <toolbarbutton id="appMenuNewCircuit"
+                       label="New Tor Circuit for this Site"
+                       class="subviewbutton subviewbutton-iconic"/>
+        <toolbarseparator/>
         <toolbaritem id="appMenu-zoom-controls" class="toolbaritem-combined-buttons" closemenu="none">
           <!-- Use a spacer, because panel sizing code gets confused when using CSS methods. -->
           <spacer class="before-label"/>