| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <set> | 5 #include <set> |
| 6 | 6 |
| 7 #include "base/basictypes.h" | 7 #include "base/basictypes.h" |
| 8 #include "chrome/browser/ui/views/accelerator_table.h" | 8 #include "chrome/browser/ui/views/accelerator_table.h" |
| 9 #include "testing/gtest/include/gtest/gtest.h" | 9 #include "testing/gtest/include/gtest/gtest.h" |
| 10 #include "ui/base/events/event_constants.h" | 10 #include "ui/base/events/event_constants.h" |
| (...skipping 25 matching lines...) Expand all Loading... |
| 36 EXPECT_TRUE(acclerators.insert(entry).second) | 36 EXPECT_TRUE(acclerators.insert(entry).second) |
| 37 << "Duplicated accelerator: " << entry.keycode << ", " | 37 << "Duplicated accelerator: " << entry.keycode << ", " |
| 38 << (entry.modifiers & ui::EF_SHIFT_DOWN) << ", " | 38 << (entry.modifiers & ui::EF_SHIFT_DOWN) << ", " |
| 39 << (entry.modifiers & ui::EF_CONTROL_DOWN) << ", " | 39 << (entry.modifiers & ui::EF_CONTROL_DOWN) << ", " |
| 40 << (entry.modifiers & ui::EF_ALT_DOWN); | 40 << (entry.modifiers & ui::EF_ALT_DOWN); |
| 41 } | 41 } |
| 42 } | 42 } |
| 43 | 43 |
| 44 #if defined(USE_ASH) | 44 #if defined(USE_ASH) |
| 45 TEST(AcceleratorTableTest, CheckDuplicatedAcceleratorsAsh) { | 45 TEST(AcceleratorTableTest, CheckDuplicatedAcceleratorsAsh) { |
| 46 std::set<AcceleratorMapping, Cmp> allowed_duplicates; | |
| 47 #if defined(OS_CHROMEOS) | |
| 48 AcceleratorMapping exception_entry; | |
| 49 // Both Chrome and Ash have a shortcut for F4 | |
| 50 exception_entry.keycode = ui::VKEY_F4; | |
| 51 exception_entry.modifiers = ui::EF_NONE; | |
| 52 exception_entry.command_id = 0; // dummy | |
| 53 allowed_duplicates.insert(exception_entry); | |
| 54 #endif | |
| 55 | |
| 56 std::set<AcceleratorMapping, Cmp> acclerators; | 46 std::set<AcceleratorMapping, Cmp> acclerators; |
| 57 for (size_t i = 0; i < kAcceleratorMapLength; ++i) { | 47 for (size_t i = 0; i < kAcceleratorMapLength; ++i) { |
| 58 const AcceleratorMapping& entry = kAcceleratorMap[i]; | 48 const AcceleratorMapping& entry = kAcceleratorMap[i]; |
| 59 acclerators.insert(entry); | 49 acclerators.insert(entry); |
| 60 } | 50 } |
| 61 for (size_t i = 0; i < ash::kAcceleratorDataLength; ++i) { | 51 for (size_t i = 0; i < ash::kAcceleratorDataLength; ++i) { |
| 62 const ash::AcceleratorData& ash_entry = ash::kAcceleratorData[i]; | 52 const ash::AcceleratorData& ash_entry = ash::kAcceleratorData[i]; |
| 63 if (!ash_entry.trigger_on_press) | 53 if (!ash_entry.trigger_on_press) |
| 64 continue; // kAcceleratorMap does not have any release accelerators. | 54 continue; // kAcceleratorMap does not have any release accelerators. |
| 65 AcceleratorMapping entry; | 55 AcceleratorMapping entry; |
| 66 entry.keycode = ash_entry.keycode; | 56 entry.keycode = ash_entry.keycode; |
| 67 entry.modifiers = ash_entry.modifiers; | 57 entry.modifiers = ash_entry.modifiers; |
| 68 entry.command_id = 0; // dummy | 58 entry.command_id = 0; // dummy |
| 69 if (allowed_duplicates.find(entry) == allowed_duplicates.end()) { | 59 EXPECT_TRUE(acclerators.insert(entry).second) |
| 70 EXPECT_TRUE(acclerators.insert(entry).second) | 60 << "Duplicated accelerator: " << entry.keycode << ", " |
| 71 << "Duplicated accelerator: " << entry.keycode << ", " | 61 << (entry.modifiers & ui::EF_SHIFT_DOWN) << ", " |
| 72 << (entry.modifiers & ui::EF_SHIFT_DOWN) << ", " | 62 << (entry.modifiers & ui::EF_CONTROL_DOWN) << ", " |
| 73 << (entry.modifiers & ui::EF_CONTROL_DOWN) << ", " | 63 << (entry.modifiers & ui::EF_ALT_DOWN); |
| 74 << (entry.modifiers & ui::EF_ALT_DOWN); | |
| 75 } | |
| 76 } | 64 } |
| 77 } | 65 } |
| 78 #endif // USE_ASH | 66 #endif // USE_ASH |
| 79 | 67 |
| 80 } // namespace chrome | 68 } // namespace chrome |
| OLD | NEW |