From: Kevin Sawicki Date: Fri, 10 Mar 2017 18:11:10 +0000 (-0800) Subject: Set automatic via else block X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5b1d5b39a2cce41562ade569462b2d5ec0a5464b;p=platform%2Fframework%2Fweb%2Fcrosswalk-tizen.git Set automatic via else block --- diff --git a/atom/browser/ui/cocoa/atom_touch_bar.mm b/atom/browser/ui/cocoa/atom_touch_bar.mm index d6f7c1c..33a6d8c 100644 --- a/atom/browser/ui/cocoa/atom_touch_bar.mm +++ b/atom/browser/ui/cocoa/atom_touch_bar.mm @@ -400,7 +400,7 @@ static NSTouchBarItemIdentifier SegmentedControlIdentifier = @"com.electron.touc } - (NSTouchBarItem*)makeSegmentedControlForID:(NSString*)id - withIdentifier:(NSString*)identifier { + withIdentifier:(NSString*)identifier { std::string s_id([id UTF8String]); if (![self hasItemWithID:s_id]) return nil; @@ -420,15 +420,13 @@ static NSTouchBarItemIdentifier SegmentedControlIdentifier = @"com.electron.touc } - (void)updateSegmentedControl:(NSCustomTouchBarItem*)item - withSettings:(const mate::PersistentDictionary&)settings { + withSettings:(const mate::PersistentDictionary&)settings { NSSegmentedControl* control = item.view; std::string segmentStyle; settings.Get("segmentStyle", &segmentStyle); - if (segmentStyle == "automatic") - control.segmentStyle = NSSegmentStyleAutomatic; - else if (segmentStyle == "rounded") + if (segmentStyle == "rounded") control.segmentStyle = NSSegmentStyleRounded; else if (segmentStyle == "textured-rounded") control.segmentStyle = NSSegmentStyleTexturedRounded;