views::Separator cleanup.

ash/common/system/tray/tray_constants.h

 // 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.
 
 #ifndef ASH_COMMON_SYSTEM_TRAY_TRAY_CONSTANTS_H_
 #define ASH_COMMON_SYSTEM_TRAY_TRAY_CONSTANTS_H_
 
 #include "ash/ash_export.h"
 
 typedef unsigned int SkColor;
@@ skipping 70 matching lines @@
 
 extern const int kTrayPopupMinWidth;
 extern const int kTrayPopupMaxWidth;
 extern const int kNotificationIconWidth;
 extern const int kNotificationButtonWidth;
 extern const int kTrayNotificationContentsWidth;
 
 // Extra padding used to adjust hitting region around tray items.
 extern const int kHitRegionPadding;
 
-// Color and width of a line used to separate tray items in the shelf and
-// system menu.
-extern const SkColor kSeparatorColor;
+// Color and width of a line used to separate tray items in the shelf.
+extern const SkColor kTraySeparatorColor;
 ASH_EXPORT extern const int kSeparatorWidth;
 
-// The color and height of the horizontal separator used in the material design
-// system menu (i.e., the vertical line used to separate elements horizontally).
-extern const SkColor kHorizontalSeparatorColor;
-extern const int kHorizontalSeparatorHeight;
+// The color of the separators used in the system menu.
+extern const SkColor kMenuSeparatorColor;
 
 // The size and foreground color of the icons appearing in the material design
 // system tray.
 extern const int kTrayIconSize;
 extern const SkColor kTrayIconColor;
 
 // The total visual padding at the start and end of the icon/label section
 // of the tray.
 extern const int kTrayEdgePadding;
 
@@ skipping 92 matching lines @@
 ASH_EXPORT int GetTrayConstant(TrayConstant constant);
 
 namespace test {
 const int kSettingsTrayItemViewId = 10000;
 const int kAccessibilityTrayItemViewId = 10001;
 }  // namespace test
 
 }  // namespace ash
 
 #endif  // ASH_COMMON_SYSTEM_TRAY_TRAY_CONSTANTS_H_