ui: Clean up naming of paint-related identifiers

ui/views/controls/tabbed_pane/tabbed_pane.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/tabbed_pane/tabbed_pane.h"
 
 #include "base/logging.h"
 #include "base/macros.h"
 #include "cc/paint/paint_flags.h"
 #include "third_party/skia/include/core/SkPath.h"
@@ skipping 322 matching lines @@
 
 TabStrip::~TabStrip() {}
 
 void TabStrip::OnSelectedTabChanged(Tab* from_tab, Tab* to_tab) {}
 
 const char* TabStrip::GetClassName() const {
   return kViewClassName;
 }
 
 void TabStrip::OnPaintBorder(gfx::Canvas* canvas) {
-  cc::PaintFlags paint;
-  paint.setColor(kTabBorderColor);
-  paint.setStrokeWidth(kTabBorderThickness);
+  cc::PaintFlags fill_flags;
+  fill_flags.setColor(kTabBorderColor);
+  fill_flags.setStrokeWidth(kTabBorderThickness);
   SkScalar line_y = SkIntToScalar(height()) - (kTabBorderThickness / 2);
   SkScalar line_end = SkIntToScalar(width());
   int selected_tab_index = GetSelectedTabIndex();
   if (selected_tab_index >= 0) {
     Tab* selected_tab = GetTabAtIndex(selected_tab_index);
     SkPath path;
     SkScalar tab_height =
         SkIntToScalar(selected_tab->height()) - kTabBorderThickness;
     SkScalar tab_width =
         SkIntToScalar(selected_tab->width()) - kTabBorderThickness;
     SkScalar tab_start = SkIntToScalar(selected_tab->GetMirroredX());
     path.moveTo(0, line_y);
     path.rLineTo(tab_start, 0);
     path.rLineTo(0, -tab_height);
     path.rLineTo(tab_width, 0);
     path.rLineTo(0, tab_height);
     path.lineTo(line_end, line_y);
 
-    cc::PaintFlags paint;
-    paint.setStyle(cc::PaintFlags::kStroke_Style);
-    paint.setColor(kTabBorderColor);
-    paint.setStrokeWidth(kTabBorderThickness);
-    canvas->DrawPath(path, paint);
+    cc::PaintFlags fill_flags;
+    fill_flags.setStyle(cc::PaintFlags::kStroke_Style);
+    fill_flags.setColor(kTabBorderColor);
+    fill_flags.setStrokeWidth(kTabBorderThickness);
+    canvas->DrawPath(path, fill_flags);
   } else {
-    canvas->sk_canvas()->drawLine(0, line_y, line_end, line_y, paint);
+    canvas->sk_canvas()->drawLine(0, line_y, line_end, line_y, fill_flags);
   }
 }
 
 Tab* TabStrip::GetTabAtIndex(int index) const {
   return static_cast<Tab*>(const_cast<View*>(child_at(index)));
 }
 
 int TabStrip::GetSelectedTabIndex() const {
   for (int i = 0; i < child_count(); ++i)
     if (GetTabAtIndex(i)->selected())
@@ skipping 247 matching lines @@
 
 View* TabbedPane::GetSelectedTabContentView() {
   return GetSelectedTab() ? GetSelectedTab()->contents() : nullptr;
 }
 
 void TabbedPane::GetAccessibleNodeData(ui::AXNodeData* node_data) {
   node_data->role = ui::AX_ROLE_TAB_LIST;
 }
 
 }  // namespace views