views::Separator cleanup.

ash/common/system/tray/tray_details_view.cc

 // 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.
 
 #include "ash/common/system/tray/tray_details_view.h"
 
 #include "ash/common/ash_view_ids.h"
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/system/tray/fixed_sized_scroll_view.h"
 #include "ash/common/system/tray/system_menu_button.h"
@@ skipping 115 matching lines @@
       DCHECK_EQ(box_layout_, GetLayoutManager());
       box_layout_->set_inside_border_insets(
           gfx::Insets(details.child->id() == VIEW_ID_STICKY_HEADER
                           ? 0
                           : kMenuSeparatorVerticalPadding,
                       0, kMenuSeparatorVerticalPadding, 0));
     }
   }
 
  private:
-  const SkColor kSeparatorColor = SkColorSetA(SK_ColorBLACK, 0x1F);
   const int kShadowOffsetY = 2;
   const int kShadowBlur = 2;
   // TODO(fukino): Remove this constant once we stop maintaining pre-MD design.
   // crbug.com/614453.
   const int kContentsBetweenChildSpacingNonMd = 1;
 
   // A structure that keeps the original offset of each header between the
   // calls to Layout() to allow keeping track of which view should be sticky.
   struct Header {
     explicit Header(views::View* view)
@@ skipping 65 matching lines @@
   }
 
   // Draws a drop shadow below |shadowed_area|.
   void DrawShadow(const ui::PaintContext& context,
                   const gfx::Rect& shadowed_area) {
     ui::PaintRecorder recorder(context, size());
     gfx::Canvas* canvas = recorder.canvas();
     cc::PaintFlags paint;
     gfx::ShadowValues shadow;
     shadow.emplace_back(gfx::Vector2d(0, kShadowOffsetY), kShadowBlur,
-                        kSeparatorColor);
+                        kMenuSeparatorColor);
     paint.setLooper(gfx::CreateShadowDrawLooperCorrectBlur(shadow));
     paint.setAntiAlias(true);
     canvas->ClipRect(shadowed_area, SkClipOp::kDifference);
     canvas->DrawRect(shadowed_area, paint);
   }
 
   views::BoxLayout* box_layout_;
 
   // Header child views that stick to the top of visible viewport when scrolled.
   std::vector<Header> headers_;
@@ skipping 105 matching lines @@
     UpdateStyle();
     tri_view_->AddView(TriView::Container::CENTER, label_);
 
     tri_view_->SetContainerVisible(TriView::Container::END, false);
 
     tri_view_->SetBorder(views::CreateEmptyBorder(kTitleRowPaddingTop, 0,
                                                   kTitleRowPaddingBottom, 0));
     AddChildViewAt(tri_view_, 0);
     views::Separator* separator =
         new views::Separator(views::Separator::HORIZONTAL);
-    separator->SetColor(kHorizontalSeparatorColor);
-    separator->SetPreferredSize(kSeparatorWidth);
+    separator->SetColor(kMenuSeparatorColor);
     separator->SetBorder(views::CreateEmptyBorder(
-        kTitleRowProgressBarHeight - kSeparatorWidth, 0, 0, 0));

[tdanderson, 2017/02/06 21:19:06]

There are two other instances of |kSeparatorWidth| in this class that you
probably want to replace with the new views version too.

[Evan Stade, 2017/02/06 21:39:17]

I intentionally did not update the uses that are not views::Separator related. I
did add a test to make sure we could use these constants interchangeably.

+        kTitleRowProgressBarHeight - views::Separator::kThickness, 0, 0, 0));
     AddChildViewAt(separator, kTitleRowSeparatorIndex);
   } else {
     title_row_ = new SpecialPopupRow();
     title_row_->SetTextLabel(string_id, this);
     AddChildViewAt(title_row_, child_count());
   }
 
   CreateExtraTitleRowButtons();
   Layout();
 }
@@ skipping 196 matching lines @@
     if (index < child_count() - 1 && child_at(index + 1) != title_row_)
       scroll_border_->set_visible(true);
     else
       scroll_border_->set_visible(false);
   }
 
   views::View::OnPaintBorder(canvas);
 }
 
 }  // namespace ash