diff options
| author | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-08 23:40:08 +0000 |
|---|---|---|
| committer | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-08 23:40:08 +0000 |
| commit | 70be00a42dc3288f483ff16e8c94a2a84b382cf6 (patch) | |
| tree | 255deefb1af9bac95ae2eafc9adca5bf374a583c /chrome | |
| parent | 8929b5f10a41c0d586c0a27dcabb1d714dde88e4 (diff) | |
| download | chromium_src-70be00a42dc3288f483ff16e8c94a2a84b382cf6.zip chromium_src-70be00a42dc3288f483ff16e8c94a2a84b382cf6.tar.gz chromium_src-70be00a42dc3288f483ff16e8c94a2a84b382cf6.tar.bz2 | |
Remove errant semicolon. distcc's pump mode didn't understand this. Also
fix presubmit warnings.
Review URL: http://codereview.chromium.org/155252
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20208 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/global_keyboard_shortcuts_mac.h | 2 | ||||
| -rw-r--r-- | chrome/browser/global_keyboard_shortcuts_mac.mm | 4 | ||||
| -rw-r--r-- | chrome/browser/global_keyboard_shortcuts_mac_unittest.cc | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/global_keyboard_shortcuts_mac.h b/chrome/browser/global_keyboard_shortcuts_mac.h index 45d9a69..f9a287c 100644 --- a/chrome/browser/global_keyboard_shortcuts_mac.h +++ b/chrome/browser/global_keyboard_shortcuts_mac.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_GLOBAL_KEYBOARD_SHORTCUTS_MAC_H_ #define CHROME_BROWSER_GLOBAL_KEYBOARD_SHORTCUTS_MAC_H_ -#include "base/basictypes.h"; +#include "base/basictypes.h" struct KeyboardShortcutData { bool command_key; diff --git a/chrome/browser/global_keyboard_shortcuts_mac.mm b/chrome/browser/global_keyboard_shortcuts_mac.mm index 426d379..f703232 100644 --- a/chrome/browser/global_keyboard_shortcuts_mac.mm +++ b/chrome/browser/global_keyboard_shortcuts_mac.mm @@ -14,9 +14,9 @@ const KeyboardShortcutData* GetKeyboardShortCutTable(size_t* num_entries) { {true, true, false, 33 /* [ */, IDC_SELECT_PREVIOUS_TAB}, {false, false, true, 116 /* pg_up */, IDC_SELECT_PREVIOUS_TAB}, }; - + *num_entries = arraysize(keyboard_shortcuts); - + return keyboard_shortcuts; } diff --git a/chrome/browser/global_keyboard_shortcuts_mac_unittest.cc b/chrome/browser/global_keyboard_shortcuts_mac_unittest.cc index c8c22d2..0b13e00 100644 --- a/chrome/browser/global_keyboard_shortcuts_mac_unittest.cc +++ b/chrome/browser/global_keyboard_shortcuts_mac_unittest.cc @@ -9,13 +9,13 @@ TEST(GlobalKeyboardShortcuts, ShortCutsToCommand) { // Test that an invalid shortcut translates into an invalid command id. ASSERT_EQ(CommandForKeyboardShortcut(false, false, false, 0), -1); - + // Check that all known keyboard shortcuts return valid results. size_t num_shortcuts = 0; const KeyboardShortcutData *it = GetKeyboardShortCutTable(&num_shortcuts); ASSERT_GT(num_shortcuts, 0U); for (size_t i = 0; i < num_shortcuts; ++i, ++it) { - int cmd_num = CommandForKeyboardShortcut(it->command_key, it->shift_key, + int cmd_num = CommandForKeyboardShortcut(it->command_key, it->shift_key, it->cntrl_key, it->vkey_code); ASSERT_EQ(cmd_num, it->chrome_command); } |