mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

[Mac] Clean up the menu controller.

Browse source
This commit is contained in:
Cheng Zhao 2013-08-14 23:03:02 +08:00
parent f908619630
commit 63b85bccab
3 changed files with 5 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

6
browser/api/atom_api_menu_mac.mm
View file

@ -24,8 +24,7 @@ MenuMac::~MenuMac() {
void MenuMac::Popup(NativeWindow* native_window) {
scoped_nsobject<AtomMenuController> menu_controller(
[[AtomMenuController alloc] initWithModel:model_.get()
useWithPopUpButtonCell:NO]);
[[AtomMenuController alloc] initWithModel:model_.get()]);
NSWindow* window = native_window->GetNativeWindow();
content::WebContents* web_contents = native_window->GetWebContents();
@ -82,8 +81,7 @@ v8::Handle<v8::Value> Menu::SetApplicationMenu(const v8::Arguments &args) {
return node::ThrowError("Menu is destroyed");
scoped_nsobject<AtomMenuController> menu_controller(
[[AtomMenuController alloc] initWithModel:menu->model_.get()
useWithPopUpButtonCell:NO]);
[[AtomMenuController alloc] initWithModel:menu->model_.get()]);
[NSApp setMainMenu:[menu_controller menu]];
// Ensure the menu_controller_ is destroyed after main menu is set.