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

WebCore/inspector/front-end/ScriptsPanel.js

Index: WebCore/inspector/front-end/ScriptsPanel.js
===================================================================
--- WebCore/inspector/front-end/ScriptsPanel.js	(revision 74262)
+++ WebCore/inspector/front-end/ScriptsPanel.js	(working copy)
@@ -1009,7 +1009,11 @@
         this._shortcuts[shortcut2.key] = handler;
         section.addAlternateKeys([ shortcut1.name, shortcut2.name ], WebInspector.UIString("Step out"));
 
-        shortcut1 = WebInspector.KeyboardShortcut.makeDescriptor("g", platformSpecificModifier);
+        var isMac = WebInspector.isMac();
+        if (isMac)
+            shortcut1 = WebInspector.KeyboardShortcut.makeDescriptor("l", WebInspector.KeyboardShortcut.Modifiers.Meta);
+        else
+            shortcut1 = WebInspector.KeyboardShortcut.makeDescriptor("g", WebInspector.KeyboardShortcut.Modifiers.Ctrl);
         this._shortcuts[shortcut1.key] = this.showGoToLineDialog.bind(this);
         section.addAlternateKeys([ shortcut1.name ], WebInspector.UIString("Go to Line"));
         this.sidebarPanes.callstack.registerShortcuts(section);