3 files changed, 19 insertions, 16 deletions

diff --git a/content_scripts/link_hints.js b/content_scripts/link_hints.js
index 8ca3675b..96ae933f 100644
--- a/content_scripts/link_hints.js
+++ b/content_scripts/link_hints.js
@@ -72,7 +72,9 @@ var linkHints = {
       this.linkActivator = function(link) {
         // When "clicking" on a link, dispatch the event with the appropriate meta key (CMD on Mac, CTRL on windows)
         // to open it in a new tab if necessary.
-        DomUtils.simulateClick(link, { metaKey: platform == "Mac", ctrlKey: platform != "Mac" });
+        DomUtils.simulateClick(link, {
+          metaKey: KeyboardUtils.platform == "Mac",
+          ctrlKey: KeyboardUtils.platform != "Mac" });
       }
     } else if (copyLinkUrl) {
       HUD.show("Copy link URL to Clipboard");
@@ -175,7 +177,7 @@ var linkHints = {
     }
 
     // TODO(philc): Ignore keys that have modifiers.
-    if (isEscape(event)) {
+    if (KeyboardUtils.isEscape(event)) {
       this.deactivateMode();
     } else {
       var keyResult = this.markerMatcher.matchHintsByKey(event, this.hintMarkers);
@@ -347,7 +349,7 @@ var alphabetHints = {
   },
 
   matchHintsByKey: function(event, hintMarkers) {
-    var keyChar = getKeyChar(event);
+    var keyChar = KeyboardUtils.getKeyChar(event);
 
     if (event.keyCode == keyCodes.backspace || event.keyCode == keyCodes.deleteKey) {
       if (!this.hintKeystrokeQueue.pop())
@@ -443,7 +445,7 @@ var filterHints = {
   },
 
   matchHintsByKey: function(event, hintMarkers) {
-    var keyChar = getKeyChar(event);
+    var keyChar = KeyboardUtils.getKeyChar(event);
     var delay = 0;
     var userIsTypingLinkText = false;
 
diff --git a/content_scripts/vimium_frontend.js b/content_scripts/vimium_frontend.js
index c1fbee1b..fc9976ad 100644
--- a/content_scripts/vimium_frontend.js
+++ b/content_scripts/vimium_frontend.js
@@ -417,7 +417,7 @@ function onKeypress(event) {
     keyChar = String.fromCharCode(event.charCode);
 
     // Enter insert mode when the user enables the native find interface.
-    if (keyChar == "f" && isPrimaryModifierKey(event)) {
+    if (keyChar == "f" && KeyboardUtils.isPrimaryModifierKey(event)) {
       enterInsertModeWithoutShowingIndicator();
       return;
     }
@@ -467,7 +467,7 @@ function onKeydown(event) {
   // avoid / being interpreted as ?
   if (((event.metaKey || event.ctrlKey || event.altKey) && event.keyCode > 31)
       || event.keyIdentifier.slice(0, 2) != "U+") {
-    keyChar = getKeyChar(event);
+    keyChar = KeyboardUtils.getKeyChar(event);
 
     if (keyChar != "") { // Again, ignore just modifiers. Maybe this should replace the keyCode>31 condition.
       var modifiers = [];
@@ -489,7 +489,7 @@ function onKeydown(event) {
     }
   }
 
-  if (isInsertMode() && isEscape(event)) {
+  if (isInsertMode() && KeyboardUtils.isEscape(event)) {
     // Note that we can't programmatically blur out of Flash embeds from Javascript.
     if (!isEmbed(event.srcElement)) {
       // Remove focus so the user can't just get himself back into insert mode by typing in the same input
@@ -501,7 +501,7 @@ function onKeydown(event) {
     }
   }
   else if (findMode) {
-    if (isEscape(event)) {
+    if (KeyboardUtils.isEscape(event)) {
       handleEscapeForFindMode();
       suppressEvent(event);
     }
@@ -517,7 +517,7 @@ function onKeydown(event) {
       event.stopPropagation();
     }
   }
-  else if (isShowingHelpDialog && isEscape(event)) {
+  else if (isShowingHelpDialog && KeyboardUtils.isEscape(event)) {
     hideHelpDialog();
   }
   else if (!isInsertMode() && !findMode) {
@@ -527,7 +527,7 @@ function onKeydown(event) {
 
       keyPort.postMessage({keyChar:keyChar, frameId:frameId});
     }
-    else if (isEscape(event)) {
+    else if (KeyboardUtils.isEscape(event)) {
       keyPort.postMessage({keyChar:"<ESC>", frameId:frameId});
     }
   }
@@ -539,8 +539,9 @@ function onKeydown(event) {
   // Subject to internationalization issues since we're using keyIdentifier instead of charCode (in keypress).
   //
   // TOOD(ilya): Revisit this. Not sure it's the absolute best approach.
-  if (keyChar == "" && !isInsertMode() && (currentCompletionKeys.indexOf(getKeyChar(event)) != -1 ||
-      isValidFirstKey(getKeyChar(event))))
+  if (keyChar == "" && !isInsertMode() &&
+     (currentCompletionKeys.indexOf(KeyboardUtils.getKeyChar(event)) != -1 ||
+      isValidFirstKey(KeyboardUtils.getKeyChar(event))))
     event.stopPropagation();
 }
 
@@ -845,7 +846,7 @@ function findAndFocus(backwards) {
     handlerStack.push({
       keydown: function(event) {
         handlerStack.pop();
-        if (isEscape(event)) {
+        if (KeyboardUtils.isEscape(event)) {
           DomUtils.simulateSelect(document.activeElement);
           enterInsertModeWithoutShowingIndicator(document.activeElement);
           return false; // we have 'consumed' this event, so do not propagate
diff --git a/content_scripts/vomnibar.js b/content_scripts/vomnibar.js
index e9d345f4..b2fc14c4 100644
--- a/content_scripts/vomnibar.js
+++ b/content_scripts/vomnibar.js
@@ -74,8 +74,8 @@ var vomnibar = (function() {
      * We support the arrow keys and other shortcuts for moving, so this method hides that complexity.
      */
     actionFromKeyEvent: function(event) {
-      var key = getKeyChar(event);
-      if (isEscape(event))
+      var key = KeyboardUtils.getKeyChar(event);
+      if (KeyboardUtils.isEscape(event))
         return "dismiss";
       else if (key == "up" ||
           (event.shiftKey && event.keyCode == keyCodes.tab) ||
@@ -93,7 +93,7 @@ var vomnibar = (function() {
       var action = this.actionFromKeyEvent(event);
       if (!action) return true; // pass through
 
-      var openInNewTab = (event.shiftKey || isPrimaryModifierKey(event));
+      var openInNewTab = (event.shiftKey || KeyboardUtils.isPrimaryModifierKey(event));
       if (action == "dismiss") {
         this.hide();
       }