Use MD-style focus indicator on DL shelf items.

ui/views/controls/button/custom_button.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/button/custom_button.h"
 
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/events/event.h"
 #include "ui/events/event_utils.h"
@@ skipping 34 matching lines @@
 
 class MdFocusRing : public views::View {
  public:
   MdFocusRing() {
     SetPaintToLayer(true);
     layer()->SetFillsBoundsOpaquely(false);
   }
   ~MdFocusRing() override {}
 
   void OnPaint(gfx::Canvas* canvas) override {
-    SkPaint paint;
-    paint.setAntiAlias(true);
-    paint.setColor(GetNativeTheme()->GetSystemColor(
-        ui::NativeTheme::kColorId_CallToActionColor));
-    paint.setStyle(SkPaint::kStroke_Style);
-    paint.setStrokeWidth(1);
-    gfx::RectF rect(GetLocalBounds());
-    rect.Inset(gfx::InsetsF(0.5));
-    canvas->DrawRoundRect(rect, kFocusBorderCornerRadius, paint);
+    CustomButton::PaintMdFocusRing(canvas, this);
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MdFocusRing);
 };
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // CustomButton, public:
 
 // static
 const char CustomButton::kViewClassName[] = "CustomButton";
 
 // static
 const CustomButton* CustomButton::AsCustomButton(const views::View* view) {
-  return AsCustomButton(const_cast<views::View*>(view));
+  return AsCustomButton(const_cast<View*>(view));
 }
 
+// static
 CustomButton* CustomButton::AsCustomButton(views::View* view) {
   if (view) {
     const char* classname = view->GetClassName();
     if (!strcmp(classname, Checkbox::kViewClassName) ||
         !strcmp(classname, CustomButton::kViewClassName) ||
         !strcmp(classname, ImageButton::kViewClassName) ||
         !strcmp(classname, LabelButton::kViewClassName) ||
         !strcmp(classname, RadioButton::kViewClassName) ||
         !strcmp(classname, MenuButton::kViewClassName)) {
       return static_cast<CustomButton*>(view);
     }
   }
   return NULL;
 }
 
+// static
+void CustomButton::PaintMdFocusRing(gfx::Canvas* canvas, views::View* view) {
+  SkPaint paint;
+  paint.setAntiAlias(true);
+  paint.setColor(view->GetNativeTheme()->GetSystemColor(
+      ui::NativeTheme::kColorId_CallToActionColor));
+  paint.setStyle(SkPaint::kStroke_Style);
+  paint.setStrokeWidth(1);
+  gfx::RectF rect(view->GetLocalBounds());
+  rect.Inset(gfx::InsetsF(0.5));
+  canvas->DrawRoundRect(rect, kFocusBorderCornerRadius, paint);
+}
+
 CustomButton::~CustomButton() {}
 
 void CustomButton::SetState(ButtonState state) {
   if (state == state_)
     return;
 
   if (animate_on_state_change_ &&
       (!is_throbbing_ || !hover_animation_.is_animating())) {
     is_throbbing_ = false;
     if ((state_ == STATE_HOVERED) && (state == STATE_NORMAL)) {
@@ skipping 390 matching lines @@
   Button::NotifyClick(event);
 }
 
 void CustomButton::OnClickCanceled(const ui::Event& event) {
   if (ink_drop_delegate())
     ink_drop_delegate()->OnAction(views::InkDropState::HIDDEN);
   Button::OnClickCanceled(event);
 }
 
 }  // namespace views