From 642db175383bc053df41e7946500845670300acb Mon Sep 17 00:00:00 2001
From: Matt Brubeck <mbrubeck@mozilla.com>
Date: Mon, 12 Aug 2013 17:17:37 -0700
Subject: [PATCH] Bug 819146 - Control/shift-enter in Metro urlbar is broken
 [r=ally]

---
 .../metro/base/content/bindings/urlbar.xml    |  3 +-
 .../base/tests/mochitest/browser_urlbar.js    | 45 +++++++++++++++++++
 2 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/browser/metro/base/content/bindings/urlbar.xml b/browser/metro/base/content/bindings/urlbar.xml
index be1c70ab336f..92e87e7bf65f 100644
--- a/browser/metro/base/content/bindings/urlbar.xml
+++ b/browser/metro/base/content/bindings/urlbar.xml
@@ -471,7 +471,8 @@
         ]]>
       </handler>
 
-      <handler event="keypress" phase="capturing" keycode="VK_RETURN">
+      <handler event="keypress" phase="capturing" keycode="VK_RETURN"
+               modifiers="accel shift any">
         <![CDATA[
           if (this.popup.submitSelected())
             return;
diff --git a/browser/metro/base/tests/mochitest/browser_urlbar.js b/browser/metro/base/tests/mochitest/browser_urlbar.js
index a29f2d197f09..e5b00df4aff2 100644
--- a/browser/metro/base/tests/mochitest/browser_urlbar.js
+++ b/browser/metro/base/tests/mochitest/browser_urlbar.js
@@ -154,6 +154,51 @@ gTests.push({
   }
 });
 
+gTests.push({
+  desc: "Control-Enter in urlbar",
+  setUp: setUp,
+  tearDown: tearDown,
+  run: function () {
+    sendElementTap(window, gEdit);
+    ok(gEdit.isEditing, "focus urlbar: in editing mode");
+
+    EventUtils.sendString("example", window);
+    EventUtils.synthesizeKey("VK_RETURN", { accelKey: true }, window);
+    is(gEdit.value, "www.example.com", "Control-enter adds www. and .com");
+    ok(!gEdit.isEditing, "hit enter in urlbar: not in editing mode");
+  }
+});
+
+gTests.push({
+  desc: "Shift-Enter in urlbar",
+  setUp: setUp,
+  tearDown: tearDown,
+  run: function () {
+    sendElementTap(window, gEdit);
+    ok(gEdit.isEditing, "focus urlbar: in editing mode");
+
+    EventUtils.sendString("example", window);
+    EventUtils.synthesizeKey("VK_RETURN", { shiftKey: true }, window);
+    is(gEdit.value, "www.example.net", "Shift-enter adds www. and .net");
+    ok(!gEdit.isEditing, "hit enter in urlbar: not in editing mode");
+  }
+});
+
+gTests.push({
+  desc: "Control-Shift-Enter in urlbar",
+  setUp: setUp,
+  tearDown: tearDown,
+  run: function () {
+    sendElementTap(window, gEdit);
+    ok(gEdit.isEditing, "focus urlbar: in editing mode");
+
+    EventUtils.sendString("example", window);
+    EventUtils.synthesizeKey("VK_RETURN", { accelKey: true, shiftKey: true }, window);
+    is(gEdit.value, "www.example.org", "Shift-enter adds www. and .org");
+    ok(!gEdit.isEditing, "hit enter in urlbar: not in editing mode");
+  }
+});
+
 gTests.push({
   desc: "display and select a search with keyboard",
   setUp: setUp,