From 28f2a4951bb72f80161e4498af60c35a66641d65 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Tue, 28 Feb 2017 13:54:20 -0800 Subject: [PATCH] touch_bar_helper_ -> atom_touch_bar_ --- atom/browser/native_window_mac.mm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/atom/browser/native_window_mac.mm b/atom/browser/native_window_mac.mm index f0ac44b63cc..af65d53368f 100644 --- a/atom/browser/native_window_mac.mm +++ b/atom/browser/native_window_mac.mm @@ -340,7 +340,7 @@ bool ScopedDisableResize::disable_resize_ = false; @private atom::NativeWindowMac* shell_; bool enable_larger_than_screen_; - base::scoped_nsobject touch_bar_helper_; + base::scoped_nsobject 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