Merge 74253 - 2010-12-17 Pavel Feldman <pfeldman@chromium.org>...

WebCore/inspector/front-end/inspector.js

 /*
  * Copyright (C) 2006, 2007, 2008 Apple Inc.  All rights reserved.
  * Copyright (C) 2007 Matt Lilek (pewtermoose@gmail.com).
  * Copyright (C) 2009 Joseph Pecoraro
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
@@ skipping 807 matching lines @@
 {
     var shortcut = WebInspector.KeyboardShortcut;
     var section = WebInspector.shortcutsHelp.section(WebInspector.UIString("All Panels"));
     var keys = [
         shortcut.shortcutToString("]", shortcut.Modifiers.CtrlOrMeta),
         shortcut.shortcutToString("[", shortcut.Modifiers.CtrlOrMeta)
     ];
     section.addRelatedKeys(keys, WebInspector.UIString("Next/previous panel"));
     section.addKey(shortcut.shortcutToString(shortcut.Keys.Esc), WebInspector.UIString("Toggle console"));
     section.addKey(shortcut.shortcutToString("f", shortcut.Modifiers.CtrlOrMeta), WebInspector.UIString("Search"));
-    keys = [
-        shortcut.shortcutToString("g", shortcut.Modifiers.CtrlOrMeta),
-        shortcut.shortcutToString("g", shortcut.Modifiers.CtrlOrMeta | shortcut.Modifiers.Shift)
-    ];
-    section.addRelatedKeys(keys, WebInspector.UIString("Find next/previous"));
+    if (WebInspector.isMac()) {
+        keys = [
+            shortcut.shortcutToString("g", shortcut.Modifiers.Meta),
+            shortcut.shortcutToString("g", shortcut.Modifiers.Meta | shortcut.Modifiers.Shift)
+        ];
+        section.addRelatedKeys(keys, WebInspector.UIString("Find next/previous"));
+    }
 }
 
 WebInspector.documentKeyDown = function(event)
 {
     var isInputElement = event.target.nodeName === "INPUT";
     var isInEditMode = event.target.enclosingNodeOrSelfWithClass("text-prompt") || WebInspector.isEditingAnyField();
     const helpKey = WebInspector.isMac() ? "U+003F" : "U+00BF"; // "?" for both platforms
 
     if (event.keyIdentifier === "F1" ||
         (event.keyIdentifier === helpKey && event.shiftKey && (!isInEditMode && !isInputElement || event.metaKey))) {
@@ skipping 61 matching lines @@
             break;
 
         case "F3":
             if (!isMac) {
                 WebInspector.focusSearchField();
                 event.preventDefault();
             }
             break;
 
         case "U+0047": // G key
-            if (isMac)
-                var isFindAgainKey = event.metaKey && !event.ctrlKey && !event.altKey;
-            else
-                var isFindAgainKey = event.ctrlKey && !event.metaKey && !event.altKey;
-
-            if (isFindAgainKey) {
+            if (isMac && event.metaKey && !event.ctrlKey && !event.altKey) {
                 if (event.shiftKey) {
                     if (this.currentPanel.jumpToPreviousSearchResult)
                         this.currentPanel.jumpToPreviousSearchResult();
                 } else if (this.currentPanel.jumpToNextSearchResult)
                     this.currentPanel.jumpToNextSearchResult();
                 event.preventDefault();
             }
-
             break;
 
         // Windows and Mac have two different definitions of [, so accept both.
         case "U+005B":
         case "U+00DB": // [ key
             if (isMac)
                 var isRotateLeft = event.metaKey && !event.shiftKey && !event.ctrlKey && !event.altKey;
             else
                 var isRotateLeft = event.ctrlKey && !event.shiftKey && !event.metaKey && !event.altKey;
 
@@ skipping 1171 matching lines @@
     {
         if (this._inHistory)
             return;
 
         this._history.splice(this._historyIterator + 1, this._history.length - this._historyIterator - 1);
         if (!this._history.length || this._history[this._history.length - 1] !== panelName)
             this._history.push(panelName);
         this._historyIterator = this._history.length - 1;
     }
 }