| 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 <stddef.h> | 5 #include <stddef.h> |
| 6 | 6 |
| 7 #include <set> | 7 #include <set> |
| 8 | 8 |
| 9 #include "build/build_config.h" | 9 #include "build/build_config.h" |
| 10 #include "chrome/browser/ui/views/accelerator_table.h" | 10 #include "chrome/browser/ui/views/accelerator_table.h" |
| 11 #include "testing/gtest/include/gtest/gtest.h" | 11 #include "testing/gtest/include/gtest/gtest.h" |
| 12 #include "ui/events/event_constants.h" | 12 #include "ui/events/event_constants.h" |
| 13 | 13 |
| 14 #if defined(USE_ASH) | 14 #if defined(USE_ASH) |
| 15 #include "ash/common/accelerators/accelerator_table.h" | 15 #include "ash/accelerators/accelerator_table.h" |
| 16 #endif // USE_ASH | 16 #endif // USE_ASH |
| 17 | 17 |
| 18 namespace chrome { | 18 namespace chrome { |
| 19 | 19 |
| 20 namespace { | 20 namespace { |
| 21 | 21 |
| 22 struct Cmp { | 22 struct Cmp { |
| 23 bool operator()(const AcceleratorMapping& lhs, | 23 bool operator()(const AcceleratorMapping& lhs, |
| 24 const AcceleratorMapping& rhs) const { | 24 const AcceleratorMapping& rhs) const { |
| 25 if (lhs.keycode != rhs.keycode) | 25 if (lhs.keycode != rhs.keycode) |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 74 EXPECT_TRUE(accelerators.insert(entry).second) | 74 EXPECT_TRUE(accelerators.insert(entry).second) |
| 75 << "Duplicated accelerator: " << entry.keycode << ", " | 75 << "Duplicated accelerator: " << entry.keycode << ", " |
| 76 << (entry.modifiers & ui::EF_SHIFT_DOWN) << ", " | 76 << (entry.modifiers & ui::EF_SHIFT_DOWN) << ", " |
| 77 << (entry.modifiers & ui::EF_CONTROL_DOWN) << ", " | 77 << (entry.modifiers & ui::EF_CONTROL_DOWN) << ", " |
| 78 << (entry.modifiers & ui::EF_ALT_DOWN); | 78 << (entry.modifiers & ui::EF_ALT_DOWN); |
| 79 } | 79 } |
| 80 } | 80 } |
| 81 #endif // USE_ASH | 81 #endif // USE_ASH |
| 82 | 82 |
| 83 } // namespace chrome | 83 } // namespace chrome |
| OLD | NEW |