Update ash shelf/tray focus rects.

ui/gfx/canvas.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/gfx/canvas.h"
 
 #include <cmath>
 #include <limits>
 
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkPath.h"
 #include "third_party/skia/include/core/SkRefCnt.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "ui/gfx/font_list.h"
+#include "ui/gfx/geometry/insets_f.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/rect_conversions.h"
 #include "ui/gfx/geometry/rect_f.h"
 #include "ui/gfx/geometry/safe_integer_conversions.h"
 #include "ui/gfx/geometry/size_conversions.h"
 #include "ui/gfx/scoped_canvas.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/gfx/transform.h"
 
 namespace gfx {
@@ skipping 308 matching lines @@
 }
 
 void Canvas::DrawFocusRect(const Rect& rect) {
   DrawFocusRect(RectF(rect));
 }
 
 void Canvas::DrawFocusRect(const RectF& rect) {
   DrawDashedRect(rect, SK_ColorGRAY);
 }
 
-void Canvas::DrawSolidFocusRect(const Rect& rect, SkColor color) {
-  DrawSolidFocusRect(RectF(rect), color);
-}
-
-void Canvas::DrawSolidFocusRect(const RectF& rect, SkColor color) {
+void Canvas::DrawSolidFocusRect(const RectF& rect,
+                                SkColor color,
+                                float thickness) {
   SkPaint paint;
   paint.setColor(color);
-  paint.setStrokeWidth(SK_Scalar1);
-  // Note: We cannot use DrawRect since it would create a path and fill it which
-  // would cause problems near the edge of the canvas.
-  float x1 = std::min(rect.x(), rect.right());
-  float x2 = std::max(rect.x(), rect.right());
-  float y1 = std::min(rect.y(), rect.bottom());
-  float y2 = std::max(rect.y(), rect.bottom());
-  DrawLine(PointF(x1, y1), PointF(x2, y1), paint);
-  DrawLine(PointF(x1, y2), PointF(x2, y2), paint);
-  DrawLine(PointF(x1, y1), PointF(x1, y2), paint);
-  DrawLine(PointF(x2, y1), PointF(x2, y2 + 1.f), paint);
+  paint.setStrokeWidth(SkFloatToScalar(thickness));
+  paint.setStyle(SkPaint::kStroke_Style);
+  gfx::RectF draw_rect = rect;
+  draw_rect.Inset(gfx::InsetsF(thickness / 2));
+  DrawRect(draw_rect, paint);
 }
 
 void Canvas::DrawImageInt(const ImageSkia& image, int x, int y) {
   SkPaint paint;
   DrawImageInt(image, x, y, paint);
 }
 
 void Canvas::DrawImageInt(const ImageSkia& image, int x, int y, uint8_t a) {
   SkPaint paint;
   paint.setAlpha(a);
@@ skipping 222 matching lines @@
   p.setFilterQuality(filter ? kLow_SkFilterQuality : kNone_SkFilterQuality);
   p.setShader(CreateImageRepShaderForScale(
       image_rep, SkShader::kRepeat_TileMode, shader_scale,
       remove_image_scale ? image_rep.scale() : 1.f));
 
   // The rect will be filled by the bitmap.
   canvas_->drawRect(dest_rect, p);
 }
 
 }  // namespace gfx