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

Unified 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 side-by-side diff with in-line comments
Download patch
« 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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/accelerator_table_unittest.cc
diff --git a/chrome/browser/ui/views/accelerator_table_unittest.cc b/chrome/browser/ui/views/accelerator_table_unittest.cc
index 070c4c1eee638d28db0d55d3aae0b39587222681..58bc5ae6120c5488c2baa6c050771d3a4aa65883 100644
--- a/chrome/browser/ui/views/accelerator_table_unittest.cc
+++ b/chrome/browser/ui/views/accelerator_table_unittest.cc
@@ -13,11 +13,13 @@
#include "ash/accelerators/accelerator_table.h"
#endif // USE_ASH
+namespace chrome {
+
namespace {
struct Cmp {
- bool operator()(const browser::AcceleratorMapping& lhs,
- const browser::AcceleratorMapping& rhs) {
+ bool operator()(const AcceleratorMapping& lhs,
+ const AcceleratorMapping& rhs) const {
if (lhs.keycode != rhs.keycode)
return lhs.keycode < rhs.keycode;
return lhs.modifiers < rhs.modifiers;
@@ -28,9 +30,9 @@ struct Cmp {
} // namespace
TEST(AcceleratorTableTest, CheckDuplicatedAccelerators) {
- std::set<browser::AcceleratorMapping, Cmp> acclerators;
- for (size_t i = 0; i < browser::kAcceleratorMapLength; ++i) {
- const browser::AcceleratorMapping& entry = browser::kAcceleratorMap[i];
+ std::set<AcceleratorMapping, Cmp> acclerators;
+ for (size_t i = 0; i < kAcceleratorMapLength; ++i) {
+ const AcceleratorMapping& entry = kAcceleratorMap[i];
EXPECT_TRUE(acclerators.insert(entry).second)
<< "Duplicated accelerator: " << entry.keycode << ", "
<< (entry.modifiers & ui::EF_SHIFT_DOWN) << ", "
@@ -41,16 +43,16 @@ TEST(AcceleratorTableTest, CheckDuplicatedAccelerators) {
#if defined(USE_ASH)
TEST(AcceleratorTableTest, CheckDuplicatedAcceleratorsAsh) {
- std::set<browser::AcceleratorMapping, Cmp> acclerators;
- for (size_t i = 0; i < browser::kAcceleratorMapLength; ++i) {
- const browser::AcceleratorMapping& entry = browser::kAcceleratorMap[i];
+ std::set<AcceleratorMapping, Cmp> acclerators;
+ for (size_t i = 0; i < kAcceleratorMapLength; ++i) {
+ const AcceleratorMapping& entry = kAcceleratorMap[i];
acclerators.insert(entry);
}
for (size_t i = 0; i < ash::kAcceleratorDataLength; ++i) {
const ash::AcceleratorData& ash_entry = ash::kAcceleratorData[i];
if (!ash_entry.trigger_on_press)
continue; // kAcceleratorMap does not have any release accelerators.
- browser::AcceleratorMapping entry;
+ AcceleratorMapping entry;
entry.keycode = ash_entry.keycode;
entry.modifiers = ash_entry.modifiers;
entry.command_id = 0; // dummy
@@ -62,3 +64,5 @@ TEST(AcceleratorTableTest, CheckDuplicatedAcceleratorsAsh) {
}
}
#endif // USE_ASH
+
+} // namespace chrome
« 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