mozilla-central: changeset 23849:3c7610653ad240027b7be26ac401b7b48f2ee0a3

author	Dão Gottwald <dao@mozilla.com>
	Sat, 17 Jan 2009 05:00:11 +0100
changeset 23849	3c7610653ad240027b7be26ac401b7b48f2ee0a3
parent 23847	723ea3c0719f6bf4d6914aa2610d4eb2e43a1c91 (current diff)
parent 23848	fc69496f131c8fb7b4eba8c33e33b62d61c8e35b (diff)
child 23850	9f94446dd65a135be12fd16d28fb9df167c69e3e
push id	4757
push user	dgottwald@mozilla.com
push date	Sat, 17 Jan 2009 04:00:45 +0000
treeherder	mozilla-central@3c7610653ad2 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
milestone	1.9.2a1pre

--- a/browser/base/content/tabbrowser.xml
+++ b/browser/base/content/tabbrowser.xml
@@ -114,17 +114,17 @@
             <xul:menuitem id="context_undoCloseTab"
                           label="&undoCloseTab.label;"
                           accesskey="&undoCloseTab.accesskey;"
                           command="History:UndoCloseTab"
                           anonid="undoCloseTabMenuItem"/>
             <xul:menuseparator/>
             <xul:menuitem id="context_closeTab" label="&closeTab.label;" accesskey="&closeTab.accesskey;"
                           oncommand="var tabbrowser = this.parentNode.parentNode.parentNode.parentNode;
-                                     tabbrowser.removeClickedTab(tabbrowser.mContextTab);"/>
+                                     tabbrowser.removeTab(tabbrowser.mContextTab);"/>
           </xul:menupopup>
 
           <xul:tabs class="tabbrowser-tabs" flex="1"
                     anonid="tabcontainer"
                     setfocus="false"
                     onclick="this.parentNode.parentNode.parentNode.onTabClick(event);"
                     xbl:inherits="onnewtab"
                     ondblclick="this.parentNode.parentNode.parentNode.onTabBarDblClick(event);"
@@ -1010,17 +1010,17 @@
 
       <method name="onTabClick">
         <parameter name="event"/>
         <body>
           <![CDATA[
             if (event.button != 1 || event.target.localName != 'tab')
               return;
 
-            this.removeClickedTab(event.target);
+            this.removeTab(event.target);
             event.stopPropagation();
           ]]>
         </body>
       </method>
 
       <method name="onTitleChanged">
         <parameter name="evt"/>
         <body>
@@ -1492,25 +1492,16 @@
         <parameter name="aTab"/>
         <body>
           <![CDATA[
             this._endRemoveTab(this._beginRemoveTab(aTab, true));
           ]]>
         </body>
       </method>
 
-      <method name="removeClickedTab">
-        <parameter name="aTab"/>
-        <body>
-          <![CDATA[
-            this._endRemoveTab(this._beginRemoveTab(aTab, true, false));
-          ]]>
-        </body>
-      </method>
-
       <!-- Returns everything that _endRemoveTab needs in an array. -->
       <method name="_beginRemoveTab">
         <parameter name="aTab"/>
         <parameter name="aFireBeforeUnload"/>
         <parameter name="aCloseWindowWithLastTab"/>
         <body>
           <![CDATA[
             if (aFireBeforeUnload) {
@@ -3296,17 +3287,17 @@
             if (event.detail > 1 && !this._ignoredClick) {
               this._ignoredClick = true;
               return;
             }
 
             // Reset the "ignored click" flag
             this._ignoredClick = false;
 
-            tabbedBrowser.removeClickedTab(bindingParent);
+            tabbedBrowser.removeTab(bindingParent);
             tabbedBrowser._blockDblClick = true;
 
             /* XXXmano hack (see bug 343628):
              * Since we're removing the event target, if the user
              * double-clicks this button, the dblclick event will be dispatched
              * with the tabbar as its event target (and explicit/originalTarget),
              * which treats that as a mouse gesture for opening a new tab.
              * In this context, we're manually blocking the dblclick event