| Index: chrome/common/extensions/command_unittest.cc
|
| diff --git a/chrome/common/extensions/command_unittest.cc b/chrome/common/extensions/command_unittest.cc
|
| index d1b6c615ea9294a7759c37e3b9328abf8be2f494..aae70ba52c032a229e1ba5c958fc5fa807edf3fb 100644
|
| --- a/chrome/common/extensions/command_unittest.cc
|
| +++ b/chrome/common/extensions/command_unittest.cc
|
| @@ -17,14 +17,22 @@ class CommandTest : public testing::Test {
|
| TEST(CommandTest, ExtensionCommandParsing) {
|
| const ui::Accelerator none = ui::Accelerator();
|
| const ui::Accelerator shift_f = ui::Accelerator(ui::VKEY_F,
|
| - ui::EF_SHIFT_DOWN);
|
| + ui::EF_SHIFT_DOWN,
|
| + ui::ET_KEY_PRESSED);
|
| const ui::Accelerator ctrl_f = ui::Accelerator(ui::VKEY_F,
|
| - ui::EF_CONTROL_DOWN);
|
| - const ui::Accelerator alt_f = ui::Accelerator(ui::VKEY_F, ui::EF_ALT_DOWN);
|
| + ui::EF_CONTROL_DOWN,
|
| + ui::ET_KEY_PRESSED);
|
| + const ui::Accelerator alt_f = ui::Accelerator(ui::VKEY_F,
|
| + ui::EF_ALT_DOWN,
|
| + ui::ET_KEY_PRESSED);
|
| const ui::Accelerator ctrl_shift_f =
|
| - ui::Accelerator(ui::VKEY_F, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN);
|
| + ui::Accelerator(ui::VKEY_F,
|
| + ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN,
|
| + ui::ET_KEY_PRESSED);
|
| const ui::Accelerator alt_shift_f =
|
| - ui::Accelerator(ui::VKEY_F, ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN);
|
| + ui::Accelerator(ui::VKEY_F,
|
| + ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN,
|
| + ui::ET_KEY_PRESSED);
|
|
|
| const struct {
|
| bool expected_result;
|
| @@ -141,19 +149,24 @@ TEST(CommandTest, ExtensionCommandParsingFallback) {
|
|
|
| #if defined(OS_WIN)
|
| ui::Accelerator accelerator(ui::VKEY_W,
|
| - ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN);
|
| + ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
|
| + ui::ET_KEY_PRESSED);
|
| #elif defined(OS_MACOSX)
|
| ui::Accelerator accelerator(ui::VKEY_M,
|
| - ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN);
|
| + ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
|
| + ui::ET_KEY_PRESSED);
|
| #elif defined(OS_CHROMEOS)
|
| ui::Accelerator accelerator(ui::VKEY_C,
|
| - ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN);
|
| + ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
|
| + ui::ET_KEY_PRESSED);
|
| #elif defined(OS_LINUX)
|
| ui::Accelerator accelerator(ui::VKEY_L,
|
| - ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN);
|
| + ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
|
| + ui::ET_KEY_PRESSED);
|
| #else
|
| ui::Accelerator accelerator(ui::VKEY_D,
|
| - ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN);
|
| + ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
|
| + ui::ET_KEY_PRESSED);
|
| #endif
|
| EXPECT_EQ(accelerator, command.accelerator());
|
|
|
|
|