Rename paint data structures

ui/views/controls/table/table_header.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 "ui/views/controls/table/table_header.h"
 
 #include <stddef.h>
 
+#include "cc/paint/paint_flags.h"
 #include "third_party/skia/include/core/SkColor.h"
-#include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkPath.h"
 #include "ui/base/cursor/cursor.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/text_utils.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/background.h"
 #include "ui/views/controls/table/table_utils.h"
 #include "ui/views/controls/table/table_view.h"
 #include "ui/views/native_cursor.h"
 
@@ skipping 81 matching lines @@
       width -= kSortIndicatorWidth;
     }
 
     canvas->DrawStringRectWithFlags(
         columns[i].column.title, font_list_, kTextColor,
         gfx::Rect(GetMirroredXWithWidthInView(x, width), kVerticalPadding,
                   width, height() - kVerticalPadding * 2),
         TableColumnAlignmentToCanvasAlignment(columns[i].column.alignment));
 
     if (paint_sort_indicator) {
-      SkPaint paint;
+      cc::PaintFlags paint;
       paint.setColor(kTextColor);
-      paint.setStyle(SkPaint::kFill_Style);
+      paint.setStyle(cc::PaintFlags::kFill_Style);
       paint.setAntiAlias(true);
 
       int indicator_x = 0;
       ui::TableColumn::Alignment alignment = columns[i].column.alignment;
       if (base::i18n::IsRTL()) {
         if (alignment == ui::TableColumn::LEFT)
           alignment = ui::TableColumn::RIGHT;
         else if (alignment == ui::TableColumn::RIGHT)
           alignment = ui::TableColumn::LEFT;
       }
@@ skipping 154 matching lines @@
   if (index > 0 && x >= column.x - kResizePadding &&
       x <= column.x + kResizePadding) {
     return index - 1;
   }
   const int max_x = column.x + column.width;
   return (x >= max_x - kResizePadding && x <= max_x + kResizePadding) ?
       index : -1;
 }
 
 }  // namespace views