fix: weakly reference MenuModel from MenuController (#23778)
This commit is contained in:
parent
f78504515b
commit
7b0a84477a
3 changed files with 73 additions and 20 deletions
|
@ -10,6 +10,7 @@
|
|||
|
||||
#include "base/callback.h"
|
||||
#include "base/mac/scoped_nsobject.h"
|
||||
#include "base/memory/weak_ptr.h"
|
||||
#include "base/strings/string16.h"
|
||||
|
||||
namespace electron {
|
||||
|
@ -24,15 +25,13 @@ class ElectronMenuModel;
|
|||
// as it only maintains weak references.
|
||||
@interface ElectronMenuController : NSObject <NSMenuDelegate> {
|
||||
@protected
|
||||
electron::ElectronMenuModel* model_; // weak
|
||||
base::WeakPtr<electron::ElectronMenuModel> model_;
|
||||
base::scoped_nsobject<NSMenu> menu_;
|
||||
BOOL isMenuOpen_;
|
||||
BOOL useDefaultAccelerator_;
|
||||
base::OnceClosure closeCallback;
|
||||
}
|
||||
|
||||
@property(nonatomic, assign) electron::ElectronMenuModel* model;
|
||||
|
||||
// Builds a NSMenu from the pre-built model (must not be nil). Changes made
|
||||
// to the contents of the model after calling this will not be noticed.
|
||||
- (id)initWithModel:(electron::ElectronMenuModel*)model
|
||||
|
@ -46,6 +45,9 @@ class ElectronMenuModel;
|
|||
// Programmatically close the constructed menu.
|
||||
- (void)cancel;
|
||||
|
||||
- (electron::ElectronMenuModel*)model;
|
||||
- (void)setModel:(electron::ElectronMenuModel*)model;
|
||||
|
||||
// Access to the constructed menu if the complex initializer was used. If the
|
||||
// default initializer was used, then this will create the menu on first call.
|
||||
- (NSMenu*)menu;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue