views::Separator cleanup.

ash/common/system/tray/tray_background_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_background_view.h"
 
 #include <algorithm>
 
 #include "ash/common/ash_constants.h"
 #include "ash/common/material_design/material_design_controller.h"
@@ skipping 568 matching lines @@
 }
 
 void TrayBackgroundView::OnPaint(gfx::Canvas* canvas) {
   ActionableView::OnPaint(canvas);
   if (!MaterialDesignController::IsShelfMaterial() ||
       shelf()->GetBackgroundType() ==
           ShelfBackgroundType::SHELF_BACKGROUND_DEFAULT ||
       !separator_visible_) {
     return;
   }
-  //  In the given |canvas|, for a horizontal shelf draw a separator line to the
-  //  right or left of the TrayBackgroundView when the system is LTR or RTL
-  //  aligned, respectively. For a vertical shelf draw the separator line
-  //  underneath the items instead.
+  // In the given |canvas|, for a horizontal shelf draw a separator line to the
+  // right or left of the TrayBackgroundView when the system is LTR or RTL
+  // aligned, respectively. For a vertical shelf draw the separator line
+  // underneath the items instead.
   const bool horizontal_shelf = IsHorizontalAlignment(shelf_alignment_);
   const gfx::Rect local_bounds = GetLocalBounds();
   const int height = kTrayItemSize;
   const int x =
       horizontal_shelf
           ? (base::i18n::IsRTL() ? 0 : (local_bounds.width() - kSeparatorWidth))
           : (local_bounds.height() - kSeparatorWidth);
   const int y = (GetShelfConstant(SHELF_SIZE) - kTrayItemSize) / 2;
   gfx::ScopedCanvas scoped_canvas(canvas);
   const float scale = canvas->UndoDeviceScaleFactor();
   cc::PaintFlags flags;
-  flags.setColor(kSeparatorColor);
+  flags.setColor(kTraySeparatorColor);
   flags.setAntiAlias(true);
 
   const gfx::Rect bounds = horizontal_shelf
                                ? gfx::Rect(x, y, kSeparatorWidth, height)
                                : gfx::Rect(y, x, height, kSeparatorWidth);
   gfx::RectF rect(gfx::ScaleRect(gfx::RectF(bounds), scale));
   gfx::PointF line_start =
       horizontal_shelf
           ? (base::i18n::IsRTL() ? rect.origin() : rect.top_right())
           : rect.bottom_left();
@@ skipping 18 matching lines @@
 }
 
 gfx::Rect TrayBackgroundView::GetBackgroundBounds() const {
   gfx::Insets insets = GetBackgroundInsets();
   gfx::Rect bounds = GetLocalBounds();
   bounds.Inset(insets);
   return bounds;
 }
 
 }  // namespace ash