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

Unified Diff: ash/accelerators/accelerator_controller_unittest.cc

Issue 11421055: Add power-user keyboard mode for ChromeOS with Search key acting as a typical Fn key. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Don't avoid remapping Alt-Up etc when a PrefService isn't around Created 8 years, 1 month 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 | « no previous file | ash/accelerators/accelerator_table.cc » ('j') | ash/accelerators/accelerator_table.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/accelerators/accelerator_controller_unittest.cc
diff --git a/ash/accelerators/accelerator_controller_unittest.cc b/ash/accelerators/accelerator_controller_unittest.cc
index 7012f4f33aa2bcffbfd6ba162e1444b2e2ffa1cb..100947fcd5c6666a0519c639c63680db6b90c3f3 100644
--- a/ash/accelerators/accelerator_controller_unittest.cc
+++ b/ash/accelerators/accelerator_controller_unittest.cc
@@ -632,10 +632,10 @@ TEST_F(AcceleratorControllerTest, GlobalAccelerators) {
{
EXPECT_FALSE(ash::Shell::GetInstance()->GetAppListTargetVisibility());
EXPECT_TRUE(ProcessWithContext(
- ui::Accelerator(ui::VKEY_LWIN, ui::EF_NONE)));
+ ReleaseAccelerator(ui::VKEY_LWIN, ui::EF_NONE)));
EXPECT_TRUE(ash::Shell::GetInstance()->GetAppListTargetVisibility());
EXPECT_TRUE(ProcessWithContext(
- ui::Accelerator(ui::VKEY_LWIN, ui::EF_NONE)));
+ ReleaseAccelerator(ui::VKEY_LWIN, ui::EF_NONE)));
EXPECT_FALSE(ash::Shell::GetInstance()->GetAppListTargetVisibility());
}
// ToggleAppList (with spoken feedback enabled)
@@ -643,10 +643,10 @@ TEST_F(AcceleratorControllerTest, GlobalAccelerators) {
ShellDelegate* delegate = ash::Shell::GetInstance()->delegate();
delegate->ToggleSpokenFeedback();
EXPECT_FALSE(ProcessWithContext(
- ui::Accelerator(ui::VKEY_LWIN, ui::EF_NONE)));
+ ReleaseAccelerator(ui::VKEY_LWIN, ui::EF_NONE)));
delegate->ToggleSpokenFeedback();
EXPECT_TRUE(ProcessWithContext(
- ui::Accelerator(ui::VKEY_LWIN, ui::EF_NONE)));
+ ReleaseAccelerator(ui::VKEY_LWIN, ui::EF_NONE)));
}
// DisableCapsLock
{
@@ -705,10 +705,10 @@ TEST_F(AcceleratorControllerTest, GlobalAccelerators) {
delegate->SetCapsLockEnabled(true);
EXPECT_TRUE(delegate->IsCapsLockEnabled());
EXPECT_TRUE(ProcessWithContext(
- ui::Accelerator(ui::VKEY_LWIN, ui::EF_ALT_DOWN)));
+ ReleaseAccelerator(ui::VKEY_LWIN, ui::EF_ALT_DOWN)));
EXPECT_FALSE(delegate->IsCapsLockEnabled());
EXPECT_TRUE(ProcessWithContext(
- ui::Accelerator(ui::VKEY_LWIN, ui::EF_ALT_DOWN)));
+ ReleaseAccelerator(ui::VKEY_LWIN, ui::EF_ALT_DOWN)));
EXPECT_TRUE(delegate->IsCapsLockEnabled());
}
#if defined(OS_CHROMEOS)
« no previous file with comments | « no previous file | ash/accelerators/accelerator_table.cc » ('j') | ash/accelerators/accelerator_table.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698