views::Separator cleanup.

ash/common/system/tray/tray_popup_utils.cc

Index: ash/common/system/tray/tray_popup_utils.cc
diff --git a/ash/common/system/tray/tray_popup_utils.cc b/ash/common/system/tray/tray_popup_utils.cc
index 3c2a607f9a3792ad6150212f674692f7697a4910..947884267b2e4ccf3459f6eb11b328c54c96b4f1 100644
--- a/ash/common/system/tray/tray_popup_utils.cc
+++ b/ash/common/system/tray/tray_popup_utils.cc
@@ -295,7 +295,7 @@ void TrayPopupUtils::ShowStickyHeaderSeparator(views::View* view,
   if (show_separator) {
     view->SetBorder(views::CreatePaddedBorder(
         views::CreateSolidSidedBorder(0, 0, kSeparatorWidth, 0,
-                                      kHorizontalSeparatorColor),
+                                      kMenuSeparatorColor),
         gfx::Insets(kMenuSeparatorVerticalPadding, 0,
                     kMenuSeparatorVerticalPadding - kSeparatorWidth, 0)));
   } else {
@@ -330,9 +330,9 @@ views::LabelButton* TrayPopupUtils::CreateTrayPopupButton(
 
 views::Separator* TrayPopupUtils::CreateVerticalSeparator() {
   views::Separator* separator =
-      new views::Separator(views::Separator::HORIZONTAL);

[Evan Stade, 2017/02/03 20:38:19]

This was actually creating a horizontal separator (i.e. --------) that was 24px
tall and 1 px long.

There seems to be confusion about the meaning of "horizontal", whether that's a
horizontal line or something that separates horizontal elements, but it's easy
to get it backwards and still have things work ok, especially for separators of
a default size (1x1 preferred size and gets laid out by a layout manager than
ignores one preferred dimension).

-  separator->SetPreferredSize(kHorizontalSeparatorHeight);
-  separator->SetColor(kHorizontalSeparatorColor);
+      new views::Separator(views::Separator::VERTICAL);
+  separator->SetPreferredLength(24);
+  separator->SetColor(kMenuSeparatorColor);
   return separator;
 }
 
@@ -423,10 +423,9 @@ gfx::Rect TrayPopupUtils::GetInkDropBounds(TrayPopupInkDropStyle ink_drop_style,
 views::Separator* TrayPopupUtils::CreateListItemSeparator(bool left_inset) {
   views::Separator* separator =
       new views::Separator(views::Separator::HORIZONTAL);
-  separator->SetColor(kHorizontalSeparatorColor);
-  separator->SetPreferredSize(kSeparatorWidth);
+  separator->SetColor(kMenuSeparatorColor);
   separator->SetBorder(views::CreateEmptyBorder(
-      kMenuSeparatorVerticalPadding - kSeparatorWidth,
+      kMenuSeparatorVerticalPadding - views::Separator::kThickness,
       left_inset
           ? kMenuExtraMarginFromLeftEdge + kMenuButtonSize +
                 kTrayPopupLabelHorizontalPadding
@@ -438,10 +437,9 @@ views::Separator* TrayPopupUtils::CreateListItemSeparator(bool left_inset) {
 views::Separator* TrayPopupUtils::CreateListSubHeaderSeparator() {
   views::Separator* separator =
       new views::Separator(views::Separator::HORIZONTAL);
-  separator->SetColor(kHorizontalSeparatorColor);
-  separator->SetPreferredSize(kSeparatorWidth);
+  separator->SetColor(kMenuSeparatorColor);
   separator->SetBorder(views::CreateEmptyBorder(
-      kMenuSeparatorVerticalPadding - kSeparatorWidth, 0, 0, 0));
+      kMenuSeparatorVerticalPadding - views::Separator::kThickness, 0, 0, 0));
   return separator;
 }