| Index: chrome/browser/resources/extensions/shortcut_util.js
|
| diff --git a/chrome/browser/resources/extensions/shortcut_util.js b/chrome/browser/resources/extensions/shortcut_util.js
|
| index 7467307ea942ed04b3f722e7830ef3b6a62de25a..58b67ad6e2ca8ea570d592e79617fc1df5fc1a84 100644
|
| --- a/chrome/browser/resources/extensions/shortcut_util.js
|
| +++ b/chrome/browser/resources/extensions/shortcut_util.js
|
| @@ -34,10 +34,7 @@ cr.define('extensions', function() {
|
| * Enum for whether we require modifiers of a keycode.
|
| * @enum {number}
|
| */
|
| - var ModifierPolicy = {
|
| - NOT_ALLOWED: 0,
|
| - REQUIRED: 1
|
| - };
|
| + var ModifierPolicy = {NOT_ALLOWED: 0, REQUIRED: 1};
|
|
|
| /**
|
| * Gets the ModifierPolicy. Currently only "MediaNextTrack", "MediaPrevTrack",
|
| @@ -67,11 +64,10 @@ cr.define('extensions', function() {
|
| */
|
| function hasModifier(e, countShiftAsModifier) {
|
| return e.ctrlKey || e.altKey ||
|
| - // Meta key is only relevant on Mac and CrOS, where we treat Command
|
| - // and Search (respectively) as modifiers.
|
| - (cr.isMac && e.metaKey) ||
|
| - (cr.isChromeOS && e.metaKey) ||
|
| - (countShiftAsModifier && e.shiftKey);
|
| + // Meta key is only relevant on Mac and CrOS, where we treat Command
|
| + // and Search (respectively) as modifiers.
|
| + (cr.isMac && e.metaKey) || (cr.isChromeOS && e.metaKey) ||
|
| + (countShiftAsModifier && e.shiftKey);
|
| }
|
|
|
| /**
|
| @@ -87,7 +83,7 @@ cr.define('extensions', function() {
|
| return true;
|
| }
|
| return (keyCode >= 'A'.charCodeAt(0) && keyCode <= 'Z'.charCodeAt(0)) ||
|
| - (keyCode >= '0'.charCodeAt(0) && keyCode <= '9'.charCodeAt(0));
|
| + (keyCode >= '0'.charCodeAt(0) && keyCode <= '9'.charCodeAt(0));
|
| }
|
|
|
| /**
|
| @@ -118,41 +114,59 @@ cr.define('extensions', function() {
|
| } else {
|
| switch (keyCode) {
|
| case Key.Comma:
|
| - output.push('Comma'); break;
|
| + output.push('Comma');
|
| + break;
|
| case Key.Del:
|
| - output.push('Delete'); break;
|
| + output.push('Delete');
|
| + break;
|
| case Key.Down:
|
| - output.push('Down'); break;
|
| + output.push('Down');
|
| + break;
|
| case Key.End:
|
| - output.push('End'); break;
|
| + output.push('End');
|
| + break;
|
| case Key.Home:
|
| - output.push('Home'); break;
|
| + output.push('Home');
|
| + break;
|
| case Key.Ins:
|
| - output.push('Insert'); break;
|
| + output.push('Insert');
|
| + break;
|
| case Key.Left:
|
| - output.push('Left'); break;
|
| + output.push('Left');
|
| + break;
|
| case Key.MediaNextTrack:
|
| - output.push('MediaNextTrack'); break;
|
| + output.push('MediaNextTrack');
|
| + break;
|
| case Key.MediaPlayPause:
|
| - output.push('MediaPlayPause'); break;
|
| + output.push('MediaPlayPause');
|
| + break;
|
| case Key.MediaPrevTrack:
|
| - output.push('MediaPrevTrack'); break;
|
| + output.push('MediaPrevTrack');
|
| + break;
|
| case Key.MediaStop:
|
| - output.push('MediaStop'); break;
|
| + output.push('MediaStop');
|
| + break;
|
| case Key.PageDown:
|
| - output.push('PageDown'); break;
|
| + output.push('PageDown');
|
| + break;
|
| case Key.PageUp:
|
| - output.push('PageUp'); break;
|
| + output.push('PageUp');
|
| + break;
|
| case Key.Period:
|
| - output.push('Period'); break;
|
| + output.push('Period');
|
| + break;
|
| case Key.Right:
|
| - output.push('Right'); break;
|
| + output.push('Right');
|
| + break;
|
| case Key.Space:
|
| - output.push('Space'); break;
|
| + output.push('Space');
|
| + break;
|
| case Key.Tab:
|
| - output.push('Tab'); break;
|
| + output.push('Tab');
|
| + break;
|
| case Key.Up:
|
| - output.push('Up'); break;
|
| + output.push('Up');
|
| + break;
|
| }
|
| }
|
| }
|
|
|