Native Themes: Add table header colors

ui/views/controls/table/table_header.cc

Index: ui/views/controls/table/table_header.cc
diff --git a/ui/views/controls/table/table_header.cc b/ui/views/controls/table/table_header.cc
index 073611d89b97a322f4e6eff82b76690bba72814f..b2672400e4a5c3327b61e00c9f28ac0261e8283e 100644
--- a/ui/views/controls/table/table_header.cc
+++ b/ui/views/controls/table/table_header.cc
@@ -33,11 +33,6 @@ const int kResizePadding = 5;
 // Amount of space above/below the separator.
 const int kSeparatorPadding = 4;
 
-const SkColor kTextColor = SK_ColorBLACK;
-const SkColor kBackgroundColor1 = SkColorSetRGB(0xF9, 0xF9, 0xF9);
-const SkColor kBackgroundColor2 = SkColorSetRGB(0xE8, 0xE8, 0xE8);
-const SkColor kSeparatorColor = SkColorSetRGB(0xAA, 0xAA, 0xAA);
-
 // Size of the sort indicator (doesn't include padding).
 const int kSortIndicatorSize = 8;
 
@@ -54,23 +49,28 @@ const int TableHeader::kSortIndicatorWidth = kSortIndicatorSize +
 typedef std::vector<TableView::VisibleColumn> Columns;
 
 TableHeader::TableHeader(TableView* table) : table_(table) {
-  set_background(Background::CreateVerticalGradientBackground(
-                     kBackgroundColor1, kBackgroundColor2));
+  set_background(

[sky, 2017/01/19 00:40:37]

OnNativeThemeChanged should always be called (first time is when added to a
widget). So, you shouldn't need to have an explicit call here.

[Tom (Use chromium acct), 2017/01/19 02:03:23]

Done.

+      Background::CreateSolidBackground(GetNativeTheme()->GetSystemColor(
+          ui::NativeTheme::kColorId_TableHeaderBackground)));
 }
 
-TableHeader::~TableHeader() {
-}
+TableHeader::~TableHeader() {}
 
 void TableHeader::Layout() {
   SetBounds(x(), y(), table_->width(), GetPreferredSize().height());
 }
 
 void TableHeader::OnPaint(gfx::Canvas* canvas) {
+  ui::NativeTheme* theme = GetNativeTheme();
+  const SkColor text_color =
+      theme->GetSystemColor(ui::NativeTheme::kColorId_TableHeaderText);
+  const SkColor separator_color =
+      theme->GetSystemColor(ui::NativeTheme::kColorId_TableHeaderSeparator);
   // Paint the background and a separator at the bottom. The separator color
   // matches that of the border around the scrollview.
   OnPaintBackground(canvas);
-  SkColor border_color = GetNativeTheme()->GetSystemColor(
-      ui::NativeTheme::kColorId_UnfocusedBorderColor);
+  SkColor border_color =
+      theme->GetSystemColor(ui::NativeTheme::kColorId_UnfocusedBorderColor);
   canvas->DrawLine(gfx::Point(0, height() - 1),
                    gfx::Point(width(), height() - 1), border_color);
 
@@ -83,7 +83,7 @@ void TableHeader::OnPaint(gfx::Canvas* canvas) {
           columns[i].x + columns[i].width - 1);
       canvas->DrawLine(gfx::Point(separator_x, kSeparatorPadding),
                        gfx::Point(separator_x, height() - kSeparatorPadding),
-                       kSeparatorColor);
+                       separator_color);
     }
 
     const int x = columns[i].x + kHorizontalPadding;
@@ -103,14 +103,14 @@ void TableHeader::OnPaint(gfx::Canvas* canvas) {
     }
 
     canvas->DrawStringRectWithFlags(
-        columns[i].column.title, font_list_, kTextColor,
+        columns[i].column.title, font_list_, text_color,
         gfx::Rect(GetMirroredXWithWidthInView(x, width), kVerticalPadding,
                   width, height() - kVerticalPadding * 2),
         TableColumnAlignmentToCanvasAlignment(columns[i].column.alignment));
 
     if (paint_sort_indicator) {
       SkPaint paint;
-      paint.setColor(kTextColor);
+      paint.setColor(text_color);
       paint.setStyle(SkPaint::kFill_Style);
       paint.setAntiAlias(true);
 
@@ -229,6 +229,11 @@ void TableHeader::OnGestureEvent(ui::GestureEvent* event) {
   event->SetHandled();
 }
 
+void TableHeader::OnNativeThemeChanged(const ui::NativeTheme* theme) {
+  set_background(Background::CreateSolidBackground(
+      theme->GetSystemColor(ui::NativeTheme::kColorId_TableHeaderBackground)));
+}
+
 bool TableHeader::StartResize(const ui::LocatedEvent& event) {
   if (is_resizing())
     return false;