Update ash shelf/tray focus rects.

ui/views/controls/slider.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/slider.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "ui/accessibility/ax_node_data.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/events/event.h"
 #include "ui/gfx/animation/slide_animation.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/rect.h"
+#include "ui/native_theme/native_theme.h"
 #include "ui/resources/grit/ui_resources.h"
 #include "ui/views/controls/md_slider.h"
 #include "ui/views/controls/non_md_slider.h"
 #include "ui/views/resources/grit/views_resources.h"
 #include "ui/views/widget/widget.h"
 
 namespace {
 const int kSlideValueChangeDurationMs = 150;
 
 // The image chunks.
@@ skipping 29 matching lines @@
   accessible_name_ = name;
 }
 
 Slider::Slider(SliderListener* listener)
     : listener_(listener),
       value_(0.f),
       keyboard_increment_(0.1f),
       initial_animating_value_(0.f),
       value_is_valid_(false),
       accessibility_events_enabled_(true),
-      focus_border_color_(0),
       initial_button_offset_(0) {
   EnableCanvasFlippingForRTLUI(true);
 #if defined(OS_MACOSX)
   SetFocusBehavior(FocusBehavior::ACCESSIBLE_ONLY);
 #else
   SetFocusBehavior(FocusBehavior::ALWAYS);
 #endif
 }
 
 float Slider::GetAnimatingValue() const{
@@ skipping 77 matching lines @@
                    : point.x() - inset.left() - initial_button_offset_;
   SetValueInternal(
       static_cast<float>(amount) / (width() - inset.width() - thumb_width),
       VALUE_CHANGED_BY_USER);
 }
 
 void Slider::OnPaintFocus(gfx::Canvas* canvas) {
   if (!HasFocus())
     return;
 
-  if (!focus_border_color_) {
-    canvas->DrawFocusRect(GetLocalBounds());
-  } else if (HasFocus()) {
-    canvas->DrawSolidFocusRect(
-        gfx::Rect(1, 1, width() - 3, height() - 3),
-        focus_border_color_);
-  }
+  // TODO(estade): make this a glow effect instead: crbug.com/658783
+  gfx::Rect focus_bounds = GetLocalBounds();
+  focus_bounds.Inset(gfx::Insets(1));
+  canvas->DrawSolidFocusRect(
+      gfx::RectF(focus_bounds),
+      SkColorSetA(GetNativeTheme()->GetSystemColor(
+                      ui::NativeTheme::kColorId_FocusedBorderColor),
+                  0x99),
+      2.f);
 }
 
 void Slider::OnSliderDragStarted() {
   SetHighlighted(true);
   if (listener_)
     listener_->SliderDragStarted(this);
 }
 
 void Slider::OnSliderDragEnded() {
   SetHighlighted(false);
@@ skipping 77 matching lines @@
       event->SetHandled();
       if (event->details().touch_points() <= 1)
         OnSliderDragEnded();
       break;
     default:
       break;
   }
 }
 
 }  // namespace views