Tweaks for scrollbar insets

ui/native_theme/native_theme_aurawin.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 "ui/native_theme/native_theme_aurawin.h"
 
 #include "grit/ui_resources.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "ui/base/nine_image_painter_factory.h"
 #include "ui/base/resource/resource_bundle.h"
@@ skipping 91 matching lines @@
       State state) const {
   if (direction == kInnerSpinButton) {
     NativeThemeAura::PaintArrowButton(gc, rect, direction, state);
     return;
   }
   PaintPainter(GetOrCreatePainter(
                    kScrollbarArrowButtonImages, state,
                    scrollbar_arrow_button_painters_),
                gc, rect);
 
-  // The arrow is slightly offset to better balance with the thumb.
-  gfx::Rect arrow_rect(rect);
-  if (direction == kScrollbarDownArrow || direction == kScrollbarUpArrow)
-    arrow_rect.Offset(1, 0);
-  else
-    arrow_rect.Offset(0, 1);
-
   // Aura-win uses slightly different arrow colors.
   SkColor arrow_color = GetArrowColor(state);
   switch (state) {
     case kHovered:
     case kNormal:
       arrow_color = SkColorSetRGB(0x50, 0x50, 0x50);
       break;
     case kPressed:
       arrow_color = SK_ColorWHITE;
     default:
       break;
   }
-  PaintArrow(gc, arrow_rect, direction, arrow_color);
+  PaintArrow(gc, rect, direction, arrow_color);
 }
 
 void NativeThemeAuraWin::PaintScrollbarTrack(
     SkCanvas* sk_canvas,
     Part part,
     State state,
     const ScrollbarTrackExtraParams& extra_params,
     const gfx::Rect& rect) const {
   if (!scrollbar_track_painter_)
     scrollbar_track_painter_ = CreateNineImagePainter(kScrollbarTrackImages);
   PaintPainter(scrollbar_track_painter_.get(), sk_canvas, rect);
 }
 
 void NativeThemeAuraWin::PaintScrollbarThumb(SkCanvas* sk_canvas,
                                              Part part,
                                              State state,
                                              const gfx::Rect& rect) const {
   gfx::Rect thumb_rect(rect);
   if (part == NativeTheme::kScrollbarVerticalThumb)
-    thumb_rect.Inset(3, 0, 1, 0);
+    thumb_rect.Inset(2, 0, 2, 0);
   else
-    thumb_rect.Inset(0, 3, 0, 1);
+    thumb_rect.Inset(0, 2, 0, 2);
   PaintPainter(GetOrCreatePainter(
                    kScrollbarThumbImages, state, scrollbar_thumb_painters_),
                sk_canvas, thumb_rect);
 }
 
 NineImagePainter* NativeThemeAuraWin::GetOrCreatePainter(
     const int images[kMaxState][9],
     State state,
     scoped_ptr<NineImagePainter> painters[kMaxState]) const {
   if (painters[state])
     return painters[state].get();
   if (images[state][0] == 0) {
     // Must always provide normal state images.
     DCHECK_NE(kNormal, state);
     return GetOrCreatePainter(images, kNormal, painters);
   }
   painters[state] = CreateNineImagePainter(images[state]);
   return painters[state].get();
 }
 
 void NativeThemeAuraWin::PaintPainter(NineImagePainter* painter,
                                       SkCanvas* sk_canvas,
                                       const gfx::Rect& rect) const {
   DCHECK(painter);
   scoped_ptr<gfx::Canvas> canvas(CreateCanvas(sk_canvas));
   painter->Paint(canvas.get(), rect);
 }
 
 }  // namespace ui