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

Use scoped_nsobject to match Chrome implementation

Browse source
This commit is contained in:
Kevin Sawicki 2017-02-28 16:44:03 -08:00
parent 812beb240b
commit ec500b2852
3 changed files with 30 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

3
atom/browser/ui/cocoa/atom_touch_bar.h
View file

@ -13,13 +13,14 @@
#include "atom/browser/native_window.h"
#include "atom/browser/ui/cocoa/touch_bar_forward_declarations.h"
#include "base/mac/scoped_nsobject.h"
#include "native_mate/constructor.h"
#include "native_mate/persistent_dictionary.h"
@interface AtomTouchBar : NSObject {
@protected
std::map<std::string, mate::PersistentDictionary> item_id_map;
std::map<std::string, NSTouchBarItem*> item_map;
std::map<std::string, base::scoped_nsobject<NSTouchBarItem>> item_map;
id<NSTouchBarDelegate> delegate_;
atom::NativeWindow* window_;
}