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> |
| 6 |
5 #include <set> | 7 #include <set> |
6 | 8 |
7 #include "base/basictypes.h" | 9 #include "build/build_config.h" |
8 #include "chrome/browser/ui/views/accelerator_table.h" | 10 #include "chrome/browser/ui/views/accelerator_table.h" |
9 #include "testing/gtest/include/gtest/gtest.h" | 11 #include "testing/gtest/include/gtest/gtest.h" |
10 #include "ui/events/event_constants.h" | 12 #include "ui/events/event_constants.h" |
11 | 13 |
12 #if defined(USE_ASH) | 14 #if defined(USE_ASH) |
13 #include "ash/accelerators/accelerator_table.h" | 15 #include "ash/accelerators/accelerator_table.h" |
14 #endif // USE_ASH | 16 #endif // USE_ASH |
15 | 17 |
16 namespace chrome { | 18 namespace chrome { |
17 | 19 |
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
72 EXPECT_TRUE(accelerators.insert(entry).second) | 74 EXPECT_TRUE(accelerators.insert(entry).second) |
73 << "Duplicated accelerator: " << entry.keycode << ", " | 75 << "Duplicated accelerator: " << entry.keycode << ", " |
74 << (entry.modifiers & ui::EF_SHIFT_DOWN) << ", " | 76 << (entry.modifiers & ui::EF_SHIFT_DOWN) << ", " |
75 << (entry.modifiers & ui::EF_CONTROL_DOWN) << ", " | 77 << (entry.modifiers & ui::EF_CONTROL_DOWN) << ", " |
76 << (entry.modifiers & ui::EF_ALT_DOWN); | 78 << (entry.modifiers & ui::EF_ALT_DOWN); |
77 } | 79 } |
78 } | 80 } |
79 #endif // USE_ASH | 81 #endif // USE_ASH |
80 | 82 |
81 } // namespace chrome | 83 } // namespace chrome |
OLD | NEW |