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

Side by Side Diff: ash/accelerators/accelerator_controller_unittest.cc

Issue 63783002: disable AcceleratorControllerTest.GlobalAcceleratorsToggleAppList on win aura (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "ash/accelerators/accelerator_controller.h" 5 #include "ash/accelerators/accelerator_controller.h"
6 #include "ash/accelerators/accelerator_table.h" 6 #include "ash/accelerators/accelerator_table.h"
7 #include "ash/accessibility_delegate.h" 7 #include "ash/accessibility_delegate.h"
8 #include "ash/caps_lock_delegate.h" 8 #include "ash/caps_lock_delegate.h"
9 #include "ash/display/display_manager.h" 9 #include "ash/display/display_manager.h"
10 #include "ash/ime_control_delegate.h" 10 #include "ash/ime_control_delegate.h"
(...skipping 948 matching lines...) Expand 10 before | Expand all | Expand 10 after
959 959
960 // Lock screen 960 // Lock screen
961 // NOTE: Accelerators that do not work on the lock screen need to be 961 // NOTE: Accelerators that do not work on the lock screen need to be
962 // tested before the sequence below is invoked because it causes a side 962 // tested before the sequence below is invoked because it causes a side
963 // effect of locking the screen. 963 // effect of locking the screen.
964 EXPECT_TRUE(ProcessWithContext( 964 EXPECT_TRUE(ProcessWithContext(
965 ui::Accelerator(ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN))); 965 ui::Accelerator(ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN)));
966 #endif 966 #endif
967 } 967 }
968 968
969 TEST_F(AcceleratorControllerTest, GlobalAcceleratorsToggleAppList) { 969 #if defined(OS_WIN) && defined(USE_AURA)
970 // Bug 316012.
971 #define MAYBE_GlobalAcceleratorsToggleAppList \
972 DISABLED_GlobalAcceleratorsToggleAppList
973 #else
974 #define MAYBE_GlobalAcceleratorsToggleAppList GlobalAcceleratorsToggleAppList
975 #endif
976
977 TEST_F(AcceleratorControllerTest, MAYBE_GlobalAcceleratorsToggleAppList) {
970 AccessibilityDelegate* delegate = 978 AccessibilityDelegate* delegate =
971 ash::Shell::GetInstance()->accessibility_delegate(); 979 ash::Shell::GetInstance()->accessibility_delegate();
972 EXPECT_FALSE(ash::Shell::GetInstance()->GetAppListTargetVisibility()); 980 EXPECT_FALSE(ash::Shell::GetInstance()->GetAppListTargetVisibility());
973 981
974 // The press event should not open the AppList, the release should instead. 982 // The press event should not open the AppList, the release should instead.
975 EXPECT_FALSE(ProcessWithContext( 983 EXPECT_FALSE(ProcessWithContext(
976 ui::Accelerator(ui::VKEY_LWIN, ui::EF_NONE))); 984 ui::Accelerator(ui::VKEY_LWIN, ui::EF_NONE)));
977 EXPECT_TRUE(ProcessWithContext( 985 EXPECT_TRUE(ProcessWithContext(
978 ReleaseAccelerator(ui::VKEY_LWIN, ui::EF_NONE))); 986 ReleaseAccelerator(ui::VKEY_LWIN, ui::EF_NONE)));
979 EXPECT_TRUE(ash::Shell::GetInstance()->GetAppListTargetVisibility()); 987 EXPECT_TRUE(ash::Shell::GetInstance()->GetAppListTargetVisibility());
(...skipping 339 matching lines...) Expand 10 before | Expand all | Expand 10 after
1319 EXPECT_EQ(volume_down, delegate->last_accelerator()); 1327 EXPECT_EQ(volume_down, delegate->last_accelerator());
1320 EXPECT_EQ(0, delegate->handle_volume_up_count()); 1328 EXPECT_EQ(0, delegate->handle_volume_up_count());
1321 EXPECT_TRUE(ProcessWithContext(volume_up)); 1329 EXPECT_TRUE(ProcessWithContext(volume_up));
1322 EXPECT_EQ(1, delegate->handle_volume_up_count()); 1330 EXPECT_EQ(1, delegate->handle_volume_up_count());
1323 EXPECT_EQ(volume_up, delegate->last_accelerator()); 1331 EXPECT_EQ(volume_up, delegate->last_accelerator());
1324 } 1332 }
1325 } 1333 }
1326 #endif 1334 #endif
1327 1335
1328 } // namespace ash 1336 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698