Style fixes; commenting.

chrome/browser/global_keyboard_shortcuts_mac.mm

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.

[Bons, 2010/11/19 22:16:24]

2010

 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <AppKit/NSEvent.h>
 #include <Carbon/Carbon.h>
 
 #include "chrome/browser/global_keyboard_shortcuts_mac.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "chrome/app/chrome_command_ids.h"
 
 // Basically, there are two kinds of keyboard shortcuts: Ones that should work
 // only if the tab contents is focused (BrowserKeyboardShortcut), and ones that
 // should work in all other cases (WindowKeyboardShortcut). In the latter case,
 // we differentiate between shortcuts that are checked before any other view
 // gets the chance to handle them (WindowKeyboardShortcut) or after all views
 // had a chance but did not handle the keypress event
-// (DelayedWindowKeyboardShortcut)
+// (DelayedWindowKeyboardShortcut).
 
-const KeyboardShortcutData* GetWindowKeyboardShortcutTable
-    (size_t* num_entries) {
+const KeyboardShortcutData* GetWindowKeyboardShortcutTable(
+    size_t* num_entries) {
   static const KeyboardShortcutData keyboard_shortcuts[] = {
+    //cmd   shift  cntrl  option
+    //---   -----  -----  ------
     // '{' / '}' characters should be matched earlier than virtual key code
     // (therefore we can match alt-8 as '{' on german keyboards).
     {true,  false, false, false, 0,             '}', IDC_SELECT_NEXT_TAB},
     {true,  false, false, false, 0,             '{', IDC_SELECT_PREVIOUS_TAB},
     {false, false, true,  false, kVK_PageDown,  0,   IDC_SELECT_NEXT_TAB},
     {false, false, true,  false, kVK_Tab,       0,   IDC_SELECT_NEXT_TAB},
     {false, false, true,  false, kVK_PageUp,    0,   IDC_SELECT_PREVIOUS_TAB},
     {false, true,  true,  false, kVK_Tab,       0,   IDC_SELECT_PREVIOUS_TAB},
     // Cmd-0..8 select the Nth tab, with cmd-9 being "last tab".
     {true,  false, false, false, kVK_ANSI_1,          0, IDC_SELECT_TAB_0},
@@ skipping 14 matching lines @@
     {true,  false, false, false, kVK_ANSI_Keypad8,    0, IDC_SELECT_TAB_7},
     {true,  false, false, false, kVK_ANSI_9,          0, IDC_SELECT_LAST_TAB},
     {true,  false, false, false, kVK_ANSI_Keypad9,    0, IDC_SELECT_LAST_TAB},
   };
 
   *num_entries = arraysize(keyboard_shortcuts);
 
   return keyboard_shortcuts;
 }
 
-const KeyboardShortcutData* GetDelayedWindowKeyboardShortcutTable
-    (size_t* num_entries) {
+const KeyboardShortcutData* GetDelayedWindowKeyboardShortcutTable(
+    size_t* num_entries) {
   static const KeyboardShortcutData keyboard_shortcuts[] = {
+    //cmd   shift  cntrl  option
+    //---   -----  -----  ------
     {false, false, false, false, kVK_Escape,        0, IDC_STOP},
   };
 
   *num_entries = arraysize(keyboard_shortcuts);
 
   return keyboard_shortcuts;
 }
 
-const KeyboardShortcutData* GetBrowserKeyboardShortcutTable
-    (size_t* num_entries) {
+const KeyboardShortcutData* GetBrowserKeyboardShortcutTable(
+    size_t* num_entries) {
   static const KeyboardShortcutData keyboard_shortcuts[] = {
+    //cmd   shift  cntrl  option
+    //---   -----  -----  ------
     {true,  false, false, false, kVK_LeftArrow,    0,   IDC_BACK},
     {true,  false, false, false, kVK_RightArrow,   0,   IDC_FORWARD},
     {false, false, false, false, kVK_Delete,       0,   IDC_BACK},
     {false, true,  false, false, kVK_Delete,       0,   IDC_FORWARD},
     {true,  true,  false, false, 0,                'c', IDC_DEV_TOOLS_INSPECT},
   };
 
   *num_entries = arraysize(keyboard_shortcuts);
 
   return keyboard_shortcuts;
@@ skipping 123 matching lines @@
           return rawChar;
     }
 
     // opt/alt modifier is set (e.g. on german layout we want '{' for opt-8).
     if ([event modifierFlags] & NSAlternateKeyMask)
       return [characters characterAtIndex:0];
   }
 
   return [eventString characterAtIndex:0];
 }