Backout ee828e9096c7 (bug 1328604) for causing some custom shortcuts to stop working on OSX. r=backout
authorStephen A Pohl <spohl.mozilla.bugs@gmail.com>
Sat, 14 Jan 2017 22:05:26 -0500
changeset 329506 0d7224996287e80d2fb78ba163fd97d006a83ee4
parent 329505 142dbb4bffc04efdb358df11293079d00af693fc
child 329507 750307a1e3f9741b1def7aa25272cc8146a83f45
push id31211
push userphilringnalda@gmail.com
push dateSun, 15 Jan 2017 20:36:52 +0000
treeherdermozilla-central@8eaf154b385b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs1328604
milestone53.0a1
backs outee828e9096c7dfce95dafddc9da6cff8b7348f34
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backout ee828e9096c7 (bug 1328604) for causing some custom shortcuts to stop working on OSX. r=backout
widget/cocoa/nsMenuBarX.mm
--- a/widget/cocoa/nsMenuBarX.mm
+++ b/widget/cocoa/nsMenuBarX.mm
@@ -43,20 +43,16 @@ static nsIContent* sPrefItemContent   = 
 static nsIContent* sQuitItemContent   = nullptr;
 
 NS_IMPL_ISUPPORTS(nsNativeMenuServiceX, nsINativeMenuService)
 
 NS_IMETHODIMP nsNativeMenuServiceX::CreateNativeMenuBar(nsIWidget* aParent, nsIContent* aMenuBarNode)
 {
   NS_ASSERTION(NS_IsMainThread(), "Attempting to create native menu bar on wrong thread!");
 
-  // We currently don't support custom shortcuts (bug 429824), so we need to
-  // avoid displaying them next to menu items.
-  [NSMenuItem setUsesUserKeyEquivalents:NO];
-
   RefPtr<nsMenuBarX> mb = new nsMenuBarX();
   if (!mb)
     return NS_ERROR_OUT_OF_MEMORY;
 
   return mb->Create(aParent, aMenuBarNode);
 }
 
 //