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

touch_bar_helper_ -> atom_touch_bar_

Browse source
This commit is contained in:
Kevin Sawicki 2017-02-28 13:54:20 -08:00
parent b39b49a15a
commit 28f2a4951b
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
atom/browser/native_window_mac.mm
View file

@ -340,7 +340,7 @@ bool ScopedDisableResize::disable_resize_ = false;
@private
atom::NativeWindowMac* shell_;
bool enable_larger_than_screen_;
base::scoped_nsobject<AtomTouchBar> touch_bar_helper_;
base::scoped_nsobject<AtomTouchBar> atom_touch_bar_;
CGFloat windowButtonsInterButtonSpacing_;
}
@property BOOL acceptsFirstMouse;
@ -372,12 +372,12 @@ bool ScopedDisableResize::disable_resize_ = false;
}
- (void)refreshTouchBarItem:(mate::Arguments*)args {
[touch_bar_helper_ refreshTouchBarItem:args];
[atom_touch_bar_ refreshTouchBarItem:args];
}
- (NSTouchBar*)makeTouchBar {
touch_bar_helper_.reset([[AtomTouchBar alloc] initWithDelegate:self window:shell_]);
return [touch_bar_helper_ makeTouchBarFromItemOptions:shell_->GetTouchBarItems()];
atom_touch_bar_.reset([[AtomTouchBar alloc] initWithDelegate:self window:shell_]);
return [atom_touch_bar_ makeTouchBarFromItemOptions:shell_->GetTouchBarItems()];
}
- (nullable NSTouchBarItem*)touchBar:(NSTouchBar*)touchBar