From 2fe21ecdd08ff8e7d3a66d18e6789318c8723a62 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 13 Mar 2017 10:28:30 -0700 Subject: [PATCH] :art: --- atom/browser/ui/cocoa/atom_touch_bar.mm | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/atom/browser/ui/cocoa/atom_touch_bar.mm b/atom/browser/ui/cocoa/atom_touch_bar.mm index 093f3d787e4c..13b25c68a567 100644 --- a/atom/browser/ui/cocoa/atom_touch_bar.mm +++ b/atom/browser/ui/cocoa/atom_touch_bar.mm @@ -189,16 +189,16 @@ static NSString* const ImageScrubberItemIdentifier = @"scrubber.image.item"; details); } -- (void)scrubber:(NSScrubber *)scrubber didSelectItemAtIndex:(NSInteger)selectedIndex { +- (void)scrubber:(NSScrubber*)scrubber didSelectItemAtIndex:(NSInteger)selectedIndex { base::DictionaryValue details; - details.SetInteger("selectedIndex", (long)selectedIndex); + details.SetInteger("selectedIndex", selectedIndex); details.SetString("type", "select"); window_->NotifyTouchBarItemInteraction([scrubber.identifier UTF8String], details); } -- (void)scrubber:(NSScrubber *)scrubber didHighlightItemAtIndex:(NSInteger)highlightedIndex { +- (void)scrubber:(NSScrubber*)scrubber didHighlightItemAtIndex:(NSInteger)highlightedIndex { base::DictionaryValue details; - details.SetInteger("highlightedIndex", (long)highlightedIndex); + details.SetInteger("highlightedIndex", highlightedIndex); details.SetString("type", "highlight"); window_->NotifyTouchBarItemInteraction([scrubber.identifier UTF8String], details); } @@ -496,7 +496,7 @@ static NSString* const ImageScrubberItemIdentifier = @"scrubber.image.item"; } - (NSTouchBarItem*)makeScrubberForID:(NSString*)id - withIdentifier:(NSString*)identifier { + withIdentifier:(NSString*)identifier { std::string s_id([id UTF8String]); if (![self hasItemWithID:s_id]) return nil; @@ -528,8 +528,7 @@ static NSString* const ImageScrubberItemIdentifier = @"scrubber.image.item"; } - (void)updateScrubber:(NSCustomTouchBarItem*)item - withSettings:(const mate::PersistentDictionary&)settings { - + withSettings:(const mate::PersistentDictionary&)settings { NSScrubber* scrubber = item.view; std::vector items;