Use icon for consistency with other touch bar APIs
authorKevin Sawicki <kevinsawicki@gmail.com>
Wed, 15 Mar 2017 16:33:11 +0000 (09:33 -0700)
committerKevin Sawicki <kevinsawicki@gmail.com>
Wed, 15 Mar 2017 16:33:11 +0000 (09:33 -0700)
atom/browser/ui/cocoa/atom_touch_bar.mm
docs/api/structures/scrubber-item.md

index 8526764..67dc62b 100644 (file)
@@ -601,7 +601,7 @@ static NSString* const ImageScrubberItemIdentifier = @"scrubber.image.item";
     NSScrubberImageItemView* view = [scrubber makeItemWithIdentifier:ImageScrubberItemIdentifier
                                                                owner:self];
     gfx::Image image;
-    if (item.Get("image", &image)) {
+    if (item.Get("icon", &image)) {
       view.image = image.AsNSImage();
     }
     itemView = view;
index b1711ce..0dd3c4f 100644 (file)
@@ -1,4 +1,4 @@
 # ScrubberItem Object
 
 * `label` String - (Optional) The text to appear in this item
-* `image` NativeImage - (Optional) The image to appear in this item
+* `icon` NativeImage - (Optional) The image to appear in this item