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

WebCore/inspector/front-end/inspector.js

Index: WebCore/inspector/front-end/inspector.js
===================================================================
--- WebCore/inspector/front-end/inspector.js	(revision 74262)
+++ WebCore/inspector/front-end/inspector.js	(working copy)
@@ -825,11 +825,13 @@
     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)
@@ -911,12 +913,7 @@
             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();
@@ -924,7 +921,6 @@
                     this.currentPanel.jumpToNextSearchResult();
                 event.preventDefault();
             }
-
             break;
 
         // Windows and Mac have two different definitions of [, so accept both.