diff options
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/app/chrome_dll.rc | 4 | ||||
| -rw-r--r-- | chrome/app/nibs/MainMenu.xib | 15 | ||||
| -rw-r--r-- | chrome/browser/gtk/standard_menus.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/views/accelerator_table_gtk.cc | 4 |
4 files changed, 13 insertions, 14 deletions
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> diff --git a/chrome/browser/gtk/standard_menus.cc b/chrome/browser/gtk/standard_menus.cc index 1223e62..db3f23a 100644 --- a/chrome/browser/gtk/standard_menus.cc +++ b/chrome/browser/gtk/standard_menus.cc @@ -32,9 +32,9 @@ struct MenuCreateMaterial developer_menu_materials[] = { { MENU_NORMAL, IDC_VIEW_SOURCE, IDS_VIEW_SOURCE, 0, NULL, GDK_u, GDK_CONTROL_MASK }, { MENU_NORMAL, IDC_DEV_TOOLS, IDS_DEV_TOOLS, 0, NULL, - GDK_j, GDK_CONTROL_MASK | GDK_SHIFT_MASK }, + GDK_i, GDK_CONTROL_MASK | GDK_SHIFT_MASK }, { MENU_NORMAL, IDC_DEV_TOOLS_CONSOLE, IDS_DEV_TOOLS_CONSOLE, 0, NULL, - GDK_c, GDK_CONTROL_MASK | GDK_SHIFT_MASK }, + GDK_j, GDK_CONTROL_MASK | GDK_SHIFT_MASK }, { MENU_NORMAL, IDC_TASK_MANAGER, IDS_TASK_MANAGER, 0, NULL, GDK_Escape, GDK_SHIFT_MASK }, { MENU_END } diff --git a/chrome/browser/views/accelerator_table_gtk.cc b/chrome/browser/views/accelerator_table_gtk.cc index 293cb64..e5ca48d 100644 --- a/chrome/browser/views/accelerator_table_gtk.cc +++ b/chrome/browser/views/accelerator_table_gtk.cc @@ -107,8 +107,8 @@ const AcceleratorMapping kAcceleratorMap[] = { { base::VKEY_O, false, true, false, IDC_OPEN_FILE }, { base::VKEY_F11, false, false, false, IDC_FULLSCREEN }, { base::VKEY_U, false, true, false, IDC_VIEW_SOURCE }, - { base::VKEY_J, true, true, false, IDC_DEV_TOOLS }, - { base::VKEY_C, true, true, false, IDC_DEV_TOOLS_CONSOLE }, + { base::VKEY_I, true, true, false, IDC_DEV_TOOLS }, + { base::VKEY_J, true, true, false, IDC_DEV_TOOLS_CONSOLE }, { base::VKEY_P, false, true, false, IDC_PRINT}, { base::VKEY_ESCAPE, true, false, false, IDC_TASK_MANAGER }, { base::VKEY_F11, false, true, true, IDC_FULLSCREEN }, |