From 15df21f3c92f91c18df5d57e93db285e2c65cec8 Mon Sep 17 00:00:00 2001
From: "pfeldman@chromium.org"
 <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Sat, 7 Nov 2009 12:07:24 +0000
Subject: DevTools: Wire Ctrl+Shift+I to DevTools, Ctrl+Shift+J to JavaScript
 console. This way modifiers are consistent on Mac and it makes sense on
 Windows/Linux.

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31383 0039d316-1c4b-4281-b951-d872f2087c98
---
 chrome/app/chrome_dll.rc     |  4 ++--
 chrome/app/nibs/MainMenu.xib | 15 +++++++--------
 2 files changed, 9 insertions(+), 10 deletions(-)

(limited to 'chrome/app')

diff --git a/chrome/app/chrome_dll.rc b/chrome/app/chrome_dll.rc
index 8e4d9dd..153849d 100644
--- a/chrome/app/chrome_dll.rc
+++ b/chrome/app/chrome_dll.rc
@@ -56,8 +56,8 @@ BEGIN
     VK_BACK,        IDC_FORWARD,                VIRTKEY, SHIFT
     VK_F11,         IDC_FULLSCREEN,             VIRTKEY
     VK_F1,          IDC_HELP_PAGE,              VIRTKEY
-    "J",            IDC_DEV_TOOLS,              VIRTKEY, CONTROL, SHIFT
-    "C",            IDC_DEV_TOOLS_CONSOLE,      VIRTKEY, CONTROL, SHIFT
+    "I",            IDC_DEV_TOOLS,              VIRTKEY, CONTROL, SHIFT
+    "J",            IDC_DEV_TOOLS_CONSOLE,      VIRTKEY, CONTROL, SHIFT
     "N",            IDC_NEW_INCOGNITO_WINDOW,   VIRTKEY, CONTROL, SHIFT
     "T",            IDC_NEW_TAB,                VIRTKEY, CONTROL
     "N",            IDC_NEW_WINDOW,             VIRTKEY, CONTROL
diff --git a/chrome/app/nibs/MainMenu.xib b/chrome/app/nibs/MainMenu.xib
index 99668e82..6bb69fc 100644
--- a/chrome/app/nibs/MainMenu.xib
+++ b/chrome/app/nibs/MainMenu.xib
@@ -8,7 +8,6 @@
 		<string key="IBDocument.HIToolboxVersion">353.00</string>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="658"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -750,7 +749,7 @@
 											<object class="NSMenuItem" id="703868281">
 												<reference key="NSMenu" ref="99609113"/>
 												<string key="NSTitle">^IDS_DEV_TOOLS_MAC</string>
-												<string key="NSKeyEquiv">j</string>
+												<string key="NSKeyEquiv">i</string>
 												<int key="NSKeyEquivModMask">1572864</int>
 												<int key="NSMnemonicLoc">2147483647</int>
 												<reference key="NSOnImage" ref="353210768"/>
@@ -760,8 +759,8 @@
 											<object class="NSMenuItem" id="981186387">
 												<reference key="NSMenu" ref="99609113"/>
 												<string key="NSTitle">^IDS_DEV_TOOLS_CONSOLE_MAC</string>
-												<string key="NSKeyEquiv">C</string>
-												<int key="NSKeyEquivModMask">1048576</int>
+												<string key="NSKeyEquiv">j</string>
+												<int key="NSKeyEquivModMask">1572864</int>
 												<int key="NSMnemonicLoc">2147483647</int>
 												<reference key="NSOnImage" ref="353210768"/>
 												<reference key="NSMixedImage" ref="549394948"/>
@@ -2671,7 +2670,7 @@
 					<reference ref="9"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<string>{{391, 140}, {361, 243}}</string>
+					<string>{{536, -194}, {361, 243}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
 					<string>{{197, 734}, {243, 243}}</string>
@@ -2715,13 +2714,13 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
 					<string>{{525, 802}, {197, 73}}</string>
-					<string>{{-24, 383}, {1578, 20}}</string>
+					<string>{{199, 280}, {1578, 20}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
 					<string>{74, 862}</string>
 					<string>{{11, 977}, {478, 20}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{617, 196}, {380, 213}}</string>
+					<string>{{786, 67}, {383, 213}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>{{475, 832}, {234, 43}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -2756,7 +2755,7 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{997, 136}, {317, 83}}</string>
+					<string>{{1169, 7}, {320, 83}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-- 
cgit v1.1