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

Unified Diff: chrome/browser/ui/cocoa/clickhold_button_cell.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
Index: chrome/browser/ui/cocoa/clickhold_button_cell.mm
diff --git a/chrome/browser/ui/cocoa/clickhold_button_cell.mm b/chrome/browser/ui/cocoa/clickhold_button_cell.mm
index f8687c805a03ae79d7162731f0444756cffbf4a5..05fbe720a0f19ec7e93cc18d0494229a04ac75f1 100644
--- a/chrome/browser/ui/cocoa/clickhold_button_cell.mm
+++ b/chrome/browser/ui/cocoa/clickhold_button_cell.mm
@@ -29,6 +29,8 @@ static const CGFloat kDragDistThreshold = 2.5;
@synthesize activateOnDrag = activateOnDrag_;
@synthesize clickHoldTarget = clickHoldTarget_;
@synthesize clickHoldAction = clickHoldAction_;
+@synthesize accessibilityShowMenuTarget = accessibilityShowMenuTarget_;
+@synthesize accessibilityShowMenuAction = accessibilityShowMenuAction_;
// Overrides:
@@ -65,7 +67,8 @@ static const CGFloat kDragDistThreshold = 2.5;
[self shouldExposeAccessibilityShowMenu]) {
NSControl* controlView = static_cast<NSControl*>([self controlView]);
if (controlView)
- [controlView sendAction:clickHoldAction_ to:clickHoldTarget_];
+ [controlView sendAction:accessibilityShowMenuAction_
+ to:accessibilityShowMenuTarget_];
return;
}
@@ -213,7 +216,7 @@ static const CGFloat kDragDistThreshold = 2.5;
- (BOOL)shouldExposeAccessibilityShowMenu {
return (enableRightClick_ || (enableClickHold_ && clickHoldTimeout_ > 0.0)) &&
- clickHoldAction_ && clickHoldTarget_;
+ accessibilityShowMenuAction_ && accessibilityShowMenuTarget_;
}
@end // @implementation ClickHoldButtonCell (Private)
« no previous file with comments | « chrome/browser/ui/cocoa/clickhold_button_cell.h ('k') | chrome/browser/ui/cocoa/clickhold_button_cell_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698