From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Wed, 15 Mar 2017 16:33:11 +0000 (-0700)
Subject: Use icon for consistency with other touch bar APIs
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=466c39ed1912a2ced1ab31dae027e8b2e0f2105e;p=platform%2Fframework%2Fweb%2Fcrosswalk-tizen.git

Use icon for consistency with other touch bar APIs
---

diff --git a/atom/browser/ui/cocoa/atom_touch_bar.mm b/atom/browser/ui/cocoa/atom_touch_bar.mm
index 8526764..67dc62b 100644
--- a/atom/browser/ui/cocoa/atom_touch_bar.mm
+++ b/atom/browser/ui/cocoa/atom_touch_bar.mm
@@ -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;
diff --git a/docs/api/structures/scrubber-item.md b/docs/api/structures/scrubber-item.md
index b1711ce..0dd3c4f 100644
--- a/docs/api/structures/scrubber-item.md
+++ b/docs/api/structures/scrubber-item.md
@@ -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