From a56b56170f4716906fb6adcf9d57876db4f3923c Mon Sep 17 00:00:00 2001
From: Drew Willcoxon <adw@mozilla.com>
Date: Thu, 15 Jul 2010 22:05:47 -0700
Subject: [PATCH] Bug 571672 - On switch-to-tab results, Alt+Enter should open
 the page in a new tab, and Ctrl+Enter should switch to tab as expected.
 r=gavin

---
 browser/base/content/urlbarBindings.xml | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/browser/base/content/urlbarBindings.xml b/browser/base/content/urlbarBindings.xml
index bfe6aef120fc..f32c96fd1066 100644
--- a/browser/base/content/urlbarBindings.xml
+++ b/browser/base/content/urlbarBindings.xml
@@ -140,15 +140,22 @@
           if (aTriggeringEvent instanceof MouseEvent && aTriggeringEvent.button == 2)
             return; // Do nothing for right clicks
 
-          var [url, postData] = this._canonizeURL(aTriggeringEvent);
-          if (!url)
-            return;
+          var url = this.value;
+          var postData = null;
 
           var action = this._parseActionUrl(url);
           if (action) {
-            if (action.type == "switchtab")
-              switchToTabHavingURI(action.param);
-            return;
+            url = action.param;
+            if (!(aTriggeringEvent && aTriggeringEvent.altKey)) {
+              if (action.type == "switchtab")
+                switchToTabHavingURI(url);
+              return;
+            }
+          }
+          else {
+            [url, postData] = this._canonizeURL(aTriggeringEvent);
+            if (!url)
+              return;
           }
 
           this.value = url;