Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(66)

Side by Side Diff: chrome/browser/ui/views/accelerator_table_unittest.cc

Issue 10698111: browser: Move more files into chrome namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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.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 {
17
16 namespace { 18 namespace {
17 19
18 struct Cmp { 20 struct Cmp {
19 bool operator()(const browser::AcceleratorMapping& lhs, 21 bool operator()(const AcceleratorMapping& lhs,
20 const browser::AcceleratorMapping& rhs) { 22 const AcceleratorMapping& rhs) const {
21 if (lhs.keycode != rhs.keycode) 23 if (lhs.keycode != rhs.keycode)
22 return lhs.keycode < rhs.keycode; 24 return lhs.keycode < rhs.keycode;
23 return lhs.modifiers < rhs.modifiers; 25 return lhs.modifiers < rhs.modifiers;
24 // Do not check |command_id|. 26 // Do not check |command_id|.
25 } 27 }
26 }; 28 };
27 29
28 } // namespace 30 } // namespace
29 31
30 TEST(AcceleratorTableTest, CheckDuplicatedAccelerators) { 32 TEST(AcceleratorTableTest, CheckDuplicatedAccelerators) {
31 std::set<browser::AcceleratorMapping, Cmp> acclerators; 33 std::set<AcceleratorMapping, Cmp> acclerators;
32 for (size_t i = 0; i < browser::kAcceleratorMapLength; ++i) { 34 for (size_t i = 0; i < kAcceleratorMapLength; ++i) {
33 const browser::AcceleratorMapping& entry = browser::kAcceleratorMap[i]; 35 const AcceleratorMapping& entry = kAcceleratorMap[i];
34 EXPECT_TRUE(acclerators.insert(entry).second) 36 EXPECT_TRUE(acclerators.insert(entry).second)
35 << "Duplicated accelerator: " << entry.keycode << ", " 37 << "Duplicated accelerator: " << entry.keycode << ", "
36 << (entry.modifiers & ui::EF_SHIFT_DOWN) << ", " 38 << (entry.modifiers & ui::EF_SHIFT_DOWN) << ", "
37 << (entry.modifiers & ui::EF_CONTROL_DOWN) << ", " 39 << (entry.modifiers & ui::EF_CONTROL_DOWN) << ", "
38 << (entry.modifiers & ui::EF_ALT_DOWN); 40 << (entry.modifiers & ui::EF_ALT_DOWN);
39 } 41 }
40 } 42 }
41 43
42 #if defined(USE_ASH) 44 #if defined(USE_ASH)
43 TEST(AcceleratorTableTest, CheckDuplicatedAcceleratorsAsh) { 45 TEST(AcceleratorTableTest, CheckDuplicatedAcceleratorsAsh) {
44 std::set<browser::AcceleratorMapping, Cmp> acclerators; 46 std::set<AcceleratorMapping, Cmp> acclerators;
45 for (size_t i = 0; i < browser::kAcceleratorMapLength; ++i) { 47 for (size_t i = 0; i < kAcceleratorMapLength; ++i) {
46 const browser::AcceleratorMapping& entry = browser::kAcceleratorMap[i]; 48 const AcceleratorMapping& entry = kAcceleratorMap[i];
47 acclerators.insert(entry); 49 acclerators.insert(entry);
48 } 50 }
49 for (size_t i = 0; i < ash::kAcceleratorDataLength; ++i) { 51 for (size_t i = 0; i < ash::kAcceleratorDataLength; ++i) {
50 const ash::AcceleratorData& ash_entry = ash::kAcceleratorData[i]; 52 const ash::AcceleratorData& ash_entry = ash::kAcceleratorData[i];
51 if (!ash_entry.trigger_on_press) 53 if (!ash_entry.trigger_on_press)
52 continue; // kAcceleratorMap does not have any release accelerators. 54 continue; // kAcceleratorMap does not have any release accelerators.
53 browser::AcceleratorMapping entry; 55 AcceleratorMapping entry;
54 entry.keycode = ash_entry.keycode; 56 entry.keycode = ash_entry.keycode;
55 entry.modifiers = ash_entry.modifiers; 57 entry.modifiers = ash_entry.modifiers;
56 entry.command_id = 0; // dummy 58 entry.command_id = 0; // dummy
57 EXPECT_TRUE(acclerators.insert(entry).second) 59 EXPECT_TRUE(acclerators.insert(entry).second)
58 << "Duplicated accelerator: " << entry.keycode << ", " 60 << "Duplicated accelerator: " << entry.keycode << ", "
59 << (entry.modifiers & ui::EF_SHIFT_DOWN) << ", " 61 << (entry.modifiers & ui::EF_SHIFT_DOWN) << ", "
60 << (entry.modifiers & ui::EF_CONTROL_DOWN) << ", " 62 << (entry.modifiers & ui::EF_CONTROL_DOWN) << ", "
61 << (entry.modifiers & ui::EF_ALT_DOWN); 63 << (entry.modifiers & ui::EF_ALT_DOWN);
62 } 64 }
63 } 65 }
64 #endif // USE_ASH 66 #endif // USE_ASH
67
68 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/accelerator_table.cc ('k') | chrome/browser/ui/views/frame/browser_frame.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698