ui: Clean up naming of paint-related identifiers

ui/views/controls/table/table_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 "ui/views/controls/table/table_view.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <map>
@@ skipping 582 matching lines @@
                 visible_columns_[j].column.alignment));
       }
     }
   }
 
   if (!grouper_ || region.min_column > 0)
     return;
 
   const SkColor grouping_color = GetNativeTheme()->GetSystemColor(
       ui::NativeTheme::kColorId_TableGroupingIndicatorColor);
-  cc::PaintFlags grouping_paint;
-  grouping_paint.setColor(grouping_color);
-  grouping_paint.setStyle(cc::PaintFlags::kFill_Style);
-  grouping_paint.setAntiAlias(true);
+  cc::PaintFlags grouping_flags;
+  grouping_flags.setColor(grouping_color);
+  grouping_flags.setStyle(cc::PaintFlags::kFill_Style);
+  grouping_flags.setAntiAlias(true);
   const int group_indicator_x = GetMirroredXInView(GetCellBounds(0, 0).x() +
       kTextHorizontalPadding + kGroupingIndicatorSize / 2);
   for (int i = region.min_row; i < region.max_row; ) {
     const int model_index = ViewToModel(i);
     GroupRange range;
     grouper_->GetGroupRange(model_index, &range);
     DCHECK_GT(range.length, 0);
     // The order of rows in a group is consistent regardless of sort, so it's ok
     // to do this calculation.
     const int start = i - (model_index - range.start);
     const int last = start + range.length - 1;
     const gfx::Rect start_cell_bounds(GetCellBounds(start, 0));
     if (start != last) {
       const gfx::Rect last_cell_bounds(GetCellBounds(last, 0));
       canvas->FillRect(gfx::Rect(
                            group_indicator_x - kGroupingIndicatorSize / 2,
                            start_cell_bounds.CenterPoint().y(),
                            kGroupingIndicatorSize,
                            last_cell_bounds.y() - start_cell_bounds.y()),
                        grouping_color);
-      canvas->DrawCircle(gfx::Point(group_indicator_x,
-                                    last_cell_bounds.CenterPoint().y()),
-                         kGroupingIndicatorSize / 2, grouping_paint);
+      canvas->DrawCircle(
+          gfx::Point(group_indicator_x, last_cell_bounds.CenterPoint().y()),
+          kGroupingIndicatorSize / 2, grouping_flags);
     }
-    canvas->DrawCircle(gfx::Point(group_indicator_x,
-                                  start_cell_bounds.CenterPoint().y()),
-                       kGroupingIndicatorSize / 2, grouping_paint);
+    canvas->DrawCircle(
+        gfx::Point(group_indicator_x, start_cell_bounds.CenterPoint().y()),
+        kGroupingIndicatorSize / 2, grouping_flags);
     i = last + 1;
   }
 }
 
 void TableView::OnFocus() {
   SchedulePaintForSelection();
   NotifyAccessibilityEvent(ui::AX_EVENT_FOCUS, true);
 }
 
 void TableView::OnBlur() {
@@ skipping 311 matching lines @@
   if (tooltip)
     *tooltip = text;
   if (tooltip_origin) {
     tooltip_origin->SetPoint(cell_bounds.x(),
                              cell_bounds.y() + kTextVerticalPadding);
   }
   return true;
 }
 
 }  // namespace views