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

Unified Diff: chrome/browser/ui/cocoa/clickhold_button_cell_unittest.mm

Issue 1256183004: Fixed crashed when activating the context menu for toolbar buttons using Voiceover (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed indentation. Created 5 years, 4 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/cocoa/clickhold_button_cell.mm ('k') | chrome/browser/ui/cocoa/menu_button.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/clickhold_button_cell_unittest.mm
diff --git a/chrome/browser/ui/cocoa/clickhold_button_cell_unittest.mm b/chrome/browser/ui/cocoa/clickhold_button_cell_unittest.mm
index decb67e2796657766f4b0a8fbfd2c6fdbccc28d3..f6ae5a1688902c5f31a9b9ba1f7f2a7d9d1e77af 100644
--- a/chrome/browser/ui/cocoa/clickhold_button_cell_unittest.mm
+++ b/chrome/browser/ui/cocoa/clickhold_button_cell_unittest.mm
@@ -92,13 +92,39 @@ TEST_F(ClickHoldButtonCellTest, AccessibilityShowMenu) {
[cell setEnableClickHold:YES];
+ // There is no action set.
actionNames = [cell accessibilityActionNames];
EXPECT_FALSE([actionNames containsObject:NSAccessibilityShowMenuAction]);
+ // clickHoldAction should be independent from accessibilityShowMenuAction
+ // since different operations, e.g. releasing vs. not releasing a mouse
+ // button, may need to be performed for each occasion.
[cell setClickHoldAction:@selector(open)];
[cell setClickHoldTarget:cellTarget];
actionNames = [cell accessibilityActionNames];
+ EXPECT_FALSE([actionNames containsObject:NSAccessibilityShowMenuAction]);
+ EXPECT_FALSE([cellTarget didOpen]);
+
+ // Even when accessibilityShowMenuAction is set, no action should be available
+ // if neither enableClickHold nor enableRightClickHold are true.
+ [cell setEnableClickHold:NO];
+ [cell setAccessibilityShowMenuAction:@selector(open)];
+ [cell setAccessibilityShowMenuTarget:cellTarget];
+
+ actionNames = [cell accessibilityActionNames];
+ EXPECT_FALSE([actionNames containsObject:NSAccessibilityShowMenuAction]);
+
+ // Now the action should be available.
+ [cell setEnableClickHold:YES];
+
+ actionNames = [cell accessibilityActionNames];
+ EXPECT_TRUE([actionNames containsObject:NSAccessibilityShowMenuAction]);
+
+ [cell setEnableClickHold:NO];
+ [cell setEnableRightClick:YES];
+
+ actionNames = [cell accessibilityActionNames];
EXPECT_TRUE([actionNames containsObject:NSAccessibilityShowMenuAction]);
[cell accessibilityPerformAction:NSAccessibilityShowMenuAction];
« no previous file with comments | « chrome/browser/ui/cocoa/clickhold_button_cell.mm ('k') | chrome/browser/ui/cocoa/menu_button.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698