Commit 70be00a4 authored by mark@chromium.org's avatar mark@chromium.org

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
parent 8929b5f1
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#ifndef CHROME_BROWSER_GLOBAL_KEYBOARD_SHORTCUTS_MAC_H_ #ifndef CHROME_BROWSER_GLOBAL_KEYBOARD_SHORTCUTS_MAC_H_
#define 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 { struct KeyboardShortcutData {
bool command_key; bool command_key;
......
...@@ -14,9 +14,9 @@ const KeyboardShortcutData* GetKeyboardShortCutTable(size_t* num_entries) { ...@@ -14,9 +14,9 @@ const KeyboardShortcutData* GetKeyboardShortCutTable(size_t* num_entries) {
{true, true, false, 33 /* [ */, IDC_SELECT_PREVIOUS_TAB}, {true, true, false, 33 /* [ */, IDC_SELECT_PREVIOUS_TAB},
{false, false, true, 116 /* pg_up */, IDC_SELECT_PREVIOUS_TAB}, {false, false, true, 116 /* pg_up */, IDC_SELECT_PREVIOUS_TAB},
}; };
*num_entries = arraysize(keyboard_shortcuts); *num_entries = arraysize(keyboard_shortcuts);
return keyboard_shortcuts; return keyboard_shortcuts;
} }
......
...@@ -9,13 +9,13 @@ ...@@ -9,13 +9,13 @@
TEST(GlobalKeyboardShortcuts, ShortCutsToCommand) { TEST(GlobalKeyboardShortcuts, ShortCutsToCommand) {
// Test that an invalid shortcut translates into an invalid command id. // Test that an invalid shortcut translates into an invalid command id.
ASSERT_EQ(CommandForKeyboardShortcut(false, false, false, 0), -1); ASSERT_EQ(CommandForKeyboardShortcut(false, false, false, 0), -1);
// Check that all known keyboard shortcuts return valid results. // Check that all known keyboard shortcuts return valid results.
size_t num_shortcuts = 0; size_t num_shortcuts = 0;
const KeyboardShortcutData *it = GetKeyboardShortCutTable(&num_shortcuts); const KeyboardShortcutData *it = GetKeyboardShortCutTable(&num_shortcuts);
ASSERT_GT(num_shortcuts, 0U); ASSERT_GT(num_shortcuts, 0U);
for (size_t i = 0; i < num_shortcuts; ++i, ++it) { 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); it->cntrl_key, it->vkey_code);
ASSERT_EQ(cmd_num, it->chrome_command); ASSERT_EQ(cmd_num, it->chrome_command);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment