Bookmark manager folder icon cleanups for list pane.

chrome/browser/resources/bookmark_manager/js/bmm/bookmark_list.js

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // TODO(arv): Now that this is driven by a data model, implement a data model
 //            that handles the loading and the events from the bookmark backend.
 
 /**
  * @typedef {{childIds: Array<string>}}
  *
@@ skipping 405 matching lines @@
     /** @override */
     decorate: function() {
       ListItem.prototype.decorate.call(this);
 
       var bookmarkNode = this.bookmarkNode;
 
       this.draggable = true;
 
       var labelEl = this.ownerDocument.createElement('div');
       labelEl.className = 'label';
-      labelEl.textContent = bookmarkNode.title;
+      var labelImgWrapper = this.ownerDocument.createElement('div');
+      labelImgWrapper.className = 'label-img-wrapper';
+      var labelImg = this.ownerDocument.createElement('div');
+      var labelText = this.ownerDocument.createElement('div');
+      labelText.className = 'label-text';
+      labelText.textContent = bookmarkNode.title;
 
       var urlEl = this.ownerDocument.createElement('div');
       urlEl.className = 'url';
 
       if (bmm.isFolder(bookmarkNode)) {
         this.className = 'folder';
+        labelImg.style.content =
+/* TODO(pkasting): Condense folder icon resources together. */
+<if expr="is_macosx">

[Dan Beam, 2016/09/21 03:14:23]

doing this at compile time is arguably better, but you can also do cr.isMac at
runtime (just fyi if you didn't know)

[Peter Kasting, 2016/09/21 04:52:35]

I didn't know!  I'd actually prefer that, since it lets me avoid the .grd change
(and this is intended to be temporary anyway).

+            cr.icon.getImage('chrome://theme/IDR_BOOKMARK_BAR_FOLDER');
+</if>
+<if expr="not is_macosx">
+            cr.icon.getImage('chrome://theme/IDR_FOLDER_CLOSED');
+</if>
       } else {
-        labelEl.style.backgroundImage = cr.icon.getFavicon(bookmarkNode.url);
-        labelEl.style.backgroundSize = '16px';
+        labelImg.style.content = cr.icon.getFavicon(bookmarkNode.url);
         urlEl.textContent = bookmarkNode.url;
       }
 
+      labelImgWrapper.appendChild(labelImg);
+      labelEl.appendChild(labelImgWrapper);
+      labelEl.appendChild(labelText);
       this.appendChild(labelEl);
       this.appendChild(urlEl);
 
       // Initially the ContextMenuButton was added here but it slowed down
       // rendering a lot so it is now added using mouseover.
     },
 
     /**
      * The ID of the bookmark folder we are currently showing or loading.
      * @type {string}
@@ skipping 179 matching lines @@
         }
       }
     }
   };
 
   return {
     BookmarkList: BookmarkList,
     list: /** @type {Element} */(null),  // Set when decorated.
   };
 });