corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1691213 - DeCOMtaminate nsINativeMenuService and rename it to mozilla::widget::NativeMenuSupport. r=spohl

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D104311
This commit is contained in:
Markus Stange
2021-02-11 19:43:58 +00:00
parent 31f0f47e14
commit d2233e7983
9 changed files with 62 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
xpfe/appshell/AppWindow.cpp
View File

@@ -80,7 +80,7 @@
#include "mozilla/dom/DocumentL10n.h"
#ifdef XP_MACOSX
# include "nsINativeMenuService.h"
# include "mozilla/widget/NativeMenuSupport.h"
# define USE_NATIVE_MENUS
#endif
@@ -2987,11 +2987,6 @@ static void LoadNativeMenus(Document* aDoc, nsIWidget* aParentWindow) {
if (gfxPlatform::IsHeadless()) {
return;
}
nsCOMPtr<nsINativeMenuService> nms =
do_GetService("@mozilla.org/widget/nativemenuservice;1");
if (!nms) {
return;
}
// Find the menubar tag (if there is more than one, we ignore all but
// the first).
@@ -3005,11 +3000,12 @@ static void LoadNativeMenus(Document* aDoc, nsIWidget* aParentWindow) {
menubarNode = menubarElements->Item(0);
}
using widget::NativeMenuSupport;
if (menubarNode) {
nsCOMPtr<Element> menubarContent(do_QueryInterface(menubarNode));
nms->CreateNativeMenuBar(aParentWindow, menubarContent);
NativeMenuSupport::CreateNativeMenuBar(aParentWindow, menubarContent);
} else {
nms->CreateNativeMenuBar(aParentWindow, nullptr);
NativeMenuSupport::CreateNativeMenuBar(aParentWindow, nullptr);
}
}