From a851422907af815f47653acfa734c6e90de539a5 Mon Sep 17 00:00:00 2001 From: "timothy_horton@apple.com" Date: Wed, 12 Nov 2014 21:55:18 +0000 Subject: [PATCH 1/1] Two action menu item titles are swapped https://bugs.webkit.org/show_bug.cgi?id=138667 Reviewed by Beth Dakin. * UIProcess/mac/WKActionMenuController.mm: (-[WKActionMenuController _createActionMenuItemForTag:]): Swap them back. git-svn-id: https://svn.webkit.org/repository/webkit/trunk@176038 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/WebKit2/ChangeLog | 12 ++++++++++++ .../WebKit2/UIProcess/mac/WKActionMenuController.mm | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog index 68510d6f3d62..93e43477e7a7 100644 --- a/Source/WebKit2/ChangeLog +++ b/Source/WebKit2/ChangeLog @@ -1,3 +1,15 @@ +2014-11-12 Tim Horton + + Two action menu item titles are swapped + https://bugs.webkit.org/show_bug.cgi?id=138667 + + + Reviewed by Beth Dakin. + + * UIProcess/mac/WKActionMenuController.mm: + (-[WKActionMenuController _createActionMenuItemForTag:]): + Swap them back. + 2014-11-12 Commit Queue Unreviewed, rolling out r175806. diff --git a/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm b/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm index fa917b80bc9e..c69edd6ef602 100644 --- a/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm +++ b/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm @@ -850,12 +850,12 @@ static NSString *pathToPhotoOnDisk(NSString *suggestedFilename) case kWKContextActionItemTagSaveVideoToDownloads: selector = @selector(_saveVideoToDownloads:); - title = WEB_UI_STRING_KEY("Share", "Share (video action menu item)", "video action menu item"); + title = WEB_UI_STRING_KEY("Save to Downloads", "Save to Downloads (video action menu item)", "video action menu item"); image = [NSImage imageNamed:@"NSActionMenuSaveToDownloads"]; break; case kWKContextActionItemTagShareVideo: - title = WEB_UI_STRING_KEY("Save to Downloads", "Save to Downloads (video action menu item)", "video action menu item"); + title = WEB_UI_STRING_KEY("Share", "Share (video action menu item)", "video action menu item"); image = [NSImage imageNamed:@"NSActionMenuShare"]; break; -- 2.36.0