Misc. cleanup

chrome/browser/resources/bookmark_manager/css/bmm.css

Index: chrome/browser/resources/bookmark_manager/css/bmm.css
diff --git a/chrome/browser/resources/bookmark_manager/css/bmm.css b/chrome/browser/resources/bookmark_manager/css/bmm.css
index 1d039178d0437b63bd843a33079f9844d9bcfdd4..0a50d0ca45b731a5b3eac7c884fea61198a9da8b 100644
--- a/chrome/browser/resources/bookmark_manager/css/bmm.css
+++ b/chrome/browser/resources/bookmark_manager/css/bmm.css
@@ -44,17 +44,52 @@ list > * > * {
   box-sizing: border-box;
   overflow: hidden;
   text-overflow: ellipsis;
-  white-space: pre; /* Don't collapse whitespace */
+  white-space: pre;
 }
 
-list > * > .label {

[Dan Beam, 2016/08/30 01:27:28]

this denotes a rigid ancestry depth (i.e. only the first level of .label in a
DAG).  i would be careful about changing stuff like this unless you thoroughly
understand what this does / have checked this code manually in many
configurations.

[Peter Kasting, 2016/08/30 01:48:46]

Since (AFAIK) we only add the label class to things that occur at this specific
depth, the two have the same effect.

I don't care much about using list > * > .label versus list .label.  I'm happy
to use either.  But we should be consistent about using one or the other unless
we actually need the difference.  What I'm trying to fix is that this file is
arbitrarily inconsistent; here we use the former, but the old code at line 76
used the latter.  So let's pick one or the other and then always use it.  If you
think I should pick the other route, that's fine.

-  -webkit-transition: all 150ms;
+list .label {
   color: black;
-  display: inline-block; /* We need to use inline-block here due to RTL. */
+  display: inline-block; /*  Makes the image start-align in RTL. */

[Dan Beam, 2016/08/30 01:27:28]

/*  Makes
  ^^
too many spaces

[Peter Kasting, 2016/08/30 22:51:29]

Done.

+}
+
+html[dir=rtl] list .label {
+  background-position: 100% 50%;
+}
+
+<if expr="is_macosx">
+list > .folder > .label,
+.tree-label,
+.tree-row[may-have-children] > .tree-label,
+.tree-item[expanded] > .tree-row > .tree-label {
+  background-image: -webkit-image-set(
+      url(../../../../app/theme/default_100_percent/mac/bookmark_bar_folder.png) 1x,
+      url(../../../../app/theme/default_200_percent/mac/bookmark_bar_folder.png) 2x);
 }
+</if>
 
-list > * > .url {
-  direction: ltr; /* URLs always read LTR */
+<if expr="not is_macosx">
+list > .folder > .label {
+  background-image: -webkit-image-set(
+      url(../../../../../ui/resources/default_100_percent/common/folder_closed.png) 1x,
+      url(../../../../../ui/resources/default_200_percent/common/folder_closed.png) 2x);
+}
+
+html[dir=rtl] list > .folder > .label {
+  background-image: -webkit-image-set(
+      url(../../../../../ui/resources/default_100_percent/common/folder_closed_rtl.png) 1x,
+      url(../../../../../ui/resources/default_200_percent/common/folder_closed_rtl.png) 2x);
+}
+</if>
+
+/* We need to ensure that even empty labels take up space, or the row could be
+ * the wrong height. */
+list .label:empty::after {
+  content: ' ';
+  white-space: pre;
+}
+
+list .url {
+  direction: ltr;
   display: none;
   flex: 1;
 }
@@ -68,31 +103,20 @@ list > [selected] > .url {
  * |div.url||div.label| - so we need padding at the right of URL, not at the
  * left. And since url is always LTR, that is padding at the end, not the start.
  */
-html[dir=rtl] .url {
+html[dir=rtl] list .url {
   -webkit-padding-end: 20px;
   -webkit-padding-start: 0;
 }
 
-html[dir=rtl] list .label {
-  background-position: 100% 50%;
-}
-
-list > .folder > .label {
-  background-image: -webkit-image-set(
-      url(../../../../../ui/resources/default_100_percent/common/folder_closed.png) 1x,
-      url(../../../../../ui/resources/default_200_percent/common/folder_closed.png) 2x);
-}
-
-/* We need to ensure that even empty labels take up space */
-list > * > .label:empty::after,
-list > * > .url:empty::after {
+/* Why did we have these?
+list .url:empty::after {
   content: ' ';
   white-space: pre;
 }
-
 list > .folder > .url:empty::after {
   content: '';
 }
+*/
 
 list > * > button {
   -webkit-transition: opacity 150ms;
@@ -183,23 +207,6 @@ list [editing] input {
 
 /* end editing */
 
-html[dir=rtl] list > .folder > .label {
-  background-image: -webkit-image-set(
-      url(../../../../../ui/resources/default_100_percent/common/folder_closed_rtl.png) 1x,
-      url(../../../../../ui/resources/default_200_percent/common/folder_closed_rtl.png) 2x);
-}
-
-<if expr="is_macosx">
-list > .folder > .label,
-.tree-label,
-.tree-row[may-have-children] > .tree-label,
-.tree-item[expanded] > .tree-row > .tree-label {
-  background-image: -webkit-image-set(
-      url(../../../../app/theme/default_100_percent/mac/bookmark_bar_folder.png) 1x,
-      url(../../../../app/theme/default_200_percent/mac/bookmark_bar_folder.png) 2x);
-}
-</if>
-
 .main {
   border-top: 1px solid rgb(156, 194, 239);
   display: flex;