From 4344c15d51aae5c1eca8b8bde6144675aec1cba2 Mon Sep 17 00:00:00 2001
From: Nick Carter <nick@chromium.org>
Date: Wed, 23 Jul 2014 15:37:24 -0700
Subject: [PATCH 1/2] Add keyboard accelerators for Attach commands.

Keyboard accelerators for Attach commands are
bound to Ctrl+[, Alt+[, and Ctrl+Alt+[. These are
picked for mnemonic harmony with Ctrl+Alt+P.

Use names that start with "Attach" for these
commands in the menus, so that they're easier
to find in the keyboard customization menu.
The names in that menu take the form
Debug.WhateverTheButtonTextIs, so we were
winding up with Debug.Attach
---
 src/VsChromium/VsChromium.vsct | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/VsChromium/VsChromium.vsct b/src/VsChromium/VsChromium.vsct
index 243abb06..cdf0d923 100644
--- a/src/VsChromium/VsChromium.vsct
+++ b/src/VsChromium/VsChromium.vsct
@@ -84,7 +84,7 @@
         <Icon guid="guidPackageChromeDebugImages" id="bmpAttachChoose" />
         <Strings>
           <CommandName>Chrome Debug: Open "Attach To Chrome" dialog</CommandName>
-          <ButtonText>Choose...</ButtonText>
+          <ButtonText>Attach to Chrome Process...</ButtonText>
         </Strings>
       </Button>
       <Button guid="guidChromeDebugCmdSet" id="cmdidAttachToAllChromes" priority="0x0000" type="Button">
@@ -92,7 +92,7 @@
         <Icon guid="guidPackageChromeDebugImages" id="bmpAttachAll" />
         <Strings>
           <CommandName>Chrome Debug: Attach to all running Chrome processes</CommandName>
-          <ButtonText>All Running Processes</ButtonText>
+          <ButtonText>Attach to All Chrome Processes</ButtonText>
         </Strings>
       </Button>
       <Button guid="guidChromeDebugCmdSet" id="cmdidAttachToChromeTree" priority="0x0001" type="Button">
@@ -100,7 +100,7 @@
         <Icon guid="guidPackageChromeDebugImages" id="bmpAttachDescendants" />
         <Strings>
           <CommandName>Chrome Debug: Attach to descendants of current debug session</CommandName>
-          <ButtonText>Descendants of Current Debug Session</ButtonText>
+          <ButtonText>Attach to Descendents of Currently Debugged Processes</ButtonText>
         </Strings>
       </Button>
     </Buttons>
@@ -111,10 +111,16 @@
   </Commands>
   <KeyBindings>
     <!-- Note: VK_OEM_1 is the semicolon character on US keyboards. -->
+    <!-- Note: VK_OEM_4 is the [ character on US keyboards. This is picked
+         so "Ctrl+Alt+[" (vs-chromium's Attach to Chrome chooser dialog) is adjacent
+         to "Ctrl+Alt+P" (Visual Studio's inbuilt Attach To Process... dialog). -->
     <KeyBinding guid="guidVsChromiumCmdSet" id="cmdidSearchFileNames" editor="guidVSStd97" key1="VK_OEM_1" mod1="Alt" />
     <KeyBinding guid="guidVsChromiumCmdSet" id="cmdidSearchDirectoryNames" editor="guidVSStd97" key1="VK_OEM_1" mod1="Alt Shift" />
     <KeyBinding guid="guidVsChromiumCmdSet" id="cmdidSearchFileContents" editor="guidVSStd97" key1="VK_OEM_1" mod1="Control Shift" />
     <KeyBinding guid="guidVsChromiumCmdSet" id="cmdidFormatComment" editor="guidVSStd97" key1="k" mod1="Control" key2="c" />
+    <KeyBinding guid="guidChromeDebugCmdSet" id="cmdidAttachToChromeDialog" editor="guidVSStd97" key1="VK_OEM_4" mod1="Control Alt" />
+    <KeyBinding guid="guidChromeDebugCmdSet" id="cmdidAttachToChromeTree" editor="guidVSStd97" key1="VK_OEM_4" mod1="Alt" />
+    <KeyBinding guid="guidChromeDebugCmdSet" id="cmdidAttachToAllChromes" editor="guidVSStd97" key1="VK_OEM_4" mod1="Control" />
   </KeyBindings>
   <Symbols>
     <!-- This is the package guid. -->

From 07e1c7e141bbd9e9c5ec8db759e3d02cce646510 Mon Sep 17 00:00:00 2001
From: Nick Carter <nick@chromium.org>
Date: Wed, 23 Jul 2014 15:46:33 -0700
Subject: [PATCH 2/2] Fix spelling.

---
 src/VsChromium/VsChromium.vsct | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/VsChromium/VsChromium.vsct b/src/VsChromium/VsChromium.vsct
index cdf0d923..4cf9a57d 100644
--- a/src/VsChromium/VsChromium.vsct
+++ b/src/VsChromium/VsChromium.vsct
@@ -100,7 +100,7 @@
         <Icon guid="guidPackageChromeDebugImages" id="bmpAttachDescendants" />
         <Strings>
           <CommandName>Chrome Debug: Attach to descendants of current debug session</CommandName>
-          <ButtonText>Attach to Descendents of Currently Debugged Processes</ButtonText>
+          <ButtonText>Attach to Descendants of Currently Debugged Processes</ButtonText>
         </Strings>
       </Button>
     </Buttons>