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

Unified Diff: ash/accelerators/accelerator_table_unittest.cc

Issue 10388230: Allow Control+Shift+Q on lock screen. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix typo Created 8 years, 7 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 | « ash/accelerators/accelerator_table.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/accelerators/accelerator_table_unittest.cc
diff --git a/ash/accelerators/accelerator_table_unittest.cc b/ash/accelerators/accelerator_table_unittest.cc
index 9be3906f914f45ff59fb26229e8ce30a7240a2bc..730d63392577820178741b63300dbfeeab94776e 100644
--- a/ash/accelerators/accelerator_table_unittest.cc
+++ b/ash/accelerators/accelerator_table_unittest.cc
@@ -38,11 +38,15 @@ TEST(AcceleratorTableTest, CheckDuplicatedAccelerators) {
}
}
-TEST(AcceleratorTableTest, CheckDuplicatedActionsAllowedAtLoginScreen) {
+TEST(AcceleratorTableTest, CheckDuplicatedActionsAllowedAtLoginOrLockScreen) {
std::set<AcceleratorAction> actions;
- for (size_t i = 0; i < kActionsAllowedAtLoginScreenLength; ++i) {
- EXPECT_TRUE(actions.insert(kActionsAllowedAtLoginScreen[i]).second)
- << "Duplicated action: " << kActionsAllowedAtLoginScreen[i];
+ for (size_t i = 0; i < kActionsAllowedAtLoginOrLockScreenLength; ++i) {
+ EXPECT_TRUE(actions.insert(kActionsAllowedAtLoginOrLockScreen[i]).second)
+ << "Duplicated action: " << kActionsAllowedAtLoginOrLockScreen[i];
+ }
+ for (size_t i = 0; i < kActionsAllowedAtLockScreenLength; ++i) {
+ EXPECT_TRUE(actions.insert(kActionsAllowedAtLockScreen[i]).second)
+ << "Duplicated action: " << kActionsAllowedAtLockScreen[i];
}
}
« no previous file with comments | « ash/accelerators/accelerator_table.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698