Clean up naming of paint-related identifiers

apps/ui/views/app_window_frame_view.cc

 // Copyright 2014 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 "apps/ui/views/app_window_frame_view.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "cc/paint/paint_flags.h"
 #include "extensions/browser/app_window/native_app_window.h"
 #include "extensions/common/draggable_region.h"
@@ skipping 287 matching lines @@
         views::CustomButton::STATE_NORMAL,
         rb.GetNativeImageNamed(IDR_APP_WINDOW_CLOSE).ToImageSkia());
   } else {
     close_button_->SetImage(
         views::CustomButton::STATE_NORMAL,
         rb.GetNativeImageNamed(IDR_APP_WINDOW_CLOSE_U).ToImageSkia());
   }
 
   SetButtonImagesForFrame();
   // TODO(benwells): different look for inactive by default.
-  cc::PaintFlags paint;
-  paint.setAntiAlias(false);
-  paint.setStyle(cc::PaintFlags::kFill_Style);
-  paint.setColor(CurrentFrameColor());
+  cc::PaintFlags flags;
+  flags.setAntiAlias(false);
+  flags.setStyle(cc::PaintFlags::kFill_Style);
+  flags.setColor(CurrentFrameColor());
   gfx::Path path;
   path.moveTo(0, 0);
   path.lineTo(width(), 0);
   path.lineTo(width(), kCaptionHeight);
   path.lineTo(0, kCaptionHeight);
   path.close();
-  canvas->DrawPath(path, paint);
+  canvas->DrawPath(path, flags);
 }
 
 const char* AppWindowFrameView::GetClassName() const { return kViewClassName; }
 
 gfx::Size AppWindowFrameView::GetMinimumSize() const {
   gfx::Size min_size = widget_->client_view()->GetMinimumSize();
   if (!draw_frame_) {
     min_size.SetToMax(gfx::Size(1, 1));
     return min_size;
   }
@@ skipping 66 matching lines @@
     restore_button_->SetImage(
         views::CustomButton::STATE_NORMAL,
         rb.GetNativeImageNamed(IDR_APP_WINDOW_RESTORE).ToImageSkia());
     minimize_button_->SetImage(
         views::CustomButton::STATE_NORMAL,
         rb.GetNativeImageNamed(IDR_APP_WINDOW_MINIMIZE).ToImageSkia());
   }
 }
 
 }  // namespace apps