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

Rename instance variable maps

Browse source
This commit is contained in:
Kevin Sawicki 2017-02-28 17:12:35 -08:00
parent ec500b2852
commit b959f782f6
3 changed files with 79 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

2
atom/browser/native_window_mac.mm
View file

@ -378,7 +378,7 @@ bool ScopedDisableResize::disable_resize_ = false;
- (NSTouchBar*)makeTouchBar {
atom_touch_bar_.reset([[AtomTouchBar alloc] initWithDelegate:self window:shell_]);
return [atom_touch_bar_ makeTouchBarFromItemOptions:shell_->GetTouchBarItems()];
return [atom_touch_bar_ makeTouchBarFromSettings:shell_->GetTouchBarItems()];
}
- (nullable NSTouchBarItem*)touchBar:(NSTouchBar*)touchBar