| 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.h" | 10 #include "ui/base/events/event_constants.h" |
| 11 | 11 |
| 12 #if defined(USE_ASH) | 12 #if defined(USE_ASH) |
| 13 #include "ash/accelerators/accelerator_table.h" | 13 #include "ash/accelerators/accelerator_table.h" |
| 14 #endif // USE_ASH | 14 #endif // USE_ASH |
| 15 | 15 |
| 16 namespace chrome { | 16 namespace chrome { |
| 17 | 17 |
| 18 namespace { | 18 namespace { |
| 19 | 19 |
| 20 struct Cmp { | 20 struct Cmp { |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 59 EXPECT_TRUE(acclerators.insert(entry).second) | 59 EXPECT_TRUE(acclerators.insert(entry).second) |
| 60 << "Duplicated accelerator: " << entry.keycode << ", " | 60 << "Duplicated accelerator: " << entry.keycode << ", " |
| 61 << (entry.modifiers & ui::EF_SHIFT_DOWN) << ", " | 61 << (entry.modifiers & ui::EF_SHIFT_DOWN) << ", " |
| 62 << (entry.modifiers & ui::EF_CONTROL_DOWN) << ", " | 62 << (entry.modifiers & ui::EF_CONTROL_DOWN) << ", " |
| 63 << (entry.modifiers & ui::EF_ALT_DOWN); | 63 << (entry.modifiers & ui::EF_ALT_DOWN); |
| 64 } | 64 } |
| 65 } | 65 } |
| 66 #endif // USE_ASH | 66 #endif // USE_ASH |
| 67 | 67 |
| 68 } // namespace chrome | 68 } // namespace chrome |
| OLD | NEW |