Harmony - update button focus rings.

chrome/browser/ui/views/download/download_item_view_md.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 "chrome/browser/ui/views/download/download_item_view_md.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <vector>
@@ skipping 47 matching lines @@
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/gfx/text_elider.h"
 #include "ui/gfx/text_utils.h"
 #include "ui/gfx/vector_icons_public.h"
 #include "ui/views/animation/flood_fill_ink_drop_ripple.h"
 #include "ui/views/animation/ink_drop_highlight.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/button/md_text_button.h"
+#include "ui/views/controls/focusable_border.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/mouse_constants.h"
 #include "ui/views/widget/root_view.h"
 #include "ui/views/widget/widget.h"
 
 using content::DownloadItem;
 using extensions::ExperienceSamplingEvent;
 
 namespace {
 
@@ skipping 41 matching lines @@
 const int kCompleteAnimationDurationMs = 2500;
 
 // How long the 'download interrupted' animation should last for.
 const int kInterruptedAnimationDurationMs = 2500;
 
 // How long we keep the item disabled after the user clicked it to open the
 // downloaded item.
 const int kDisabledOnOpenDuration = 3000;
 
 // The separator is drawn as a border. It's one dp wide.
-class SeparatorBorder : public views::Border {
+class SeparatorBorder : public views::FocusableBorder {
  public:
   explicit SeparatorBorder(SkColor color) : color_(color) {}
   ~SeparatorBorder() override {}
 
   void Paint(const views::View& view, gfx::Canvas* canvas) override {
+    if (view.HasFocus())
+      return FocusableBorder::Paint(view, canvas);
+
     int end_x = base::i18n::IsRTL() ? 0 : view.width() - 1;
     canvas->DrawLine(gfx::Point(end_x, kTopBottomPadding),
                      gfx::Point(end_x, view.height() - kTopBottomPadding),
                      color_);
   }
 
   gfx::Insets GetInsets() const override { return gfx::Insets(0, 0, 0, 1); }
 
   gfx::Size GetMinimumSize() const override {
     return gfx::Size(1, 2 * kTopBottomPadding + 1);
@@ skipping 460 matching lines @@
   // transparent, start with a black backdrop (which is the default initialized
   // color for opaque canvases).
   canvas->DrawColor(SK_ColorBLACK);
   canvas->DrawColor(
       GetThemeProvider()->GetColor(ThemeProperties::COLOR_TOOLBAR));
 
   DrawStatusText(canvas);
   DrawFilename(canvas);
   DrawIcon(canvas);
   OnPaintBorder(canvas);
-
-  if (HasFocus())
-    views::MdTextButton::PaintMdFocusRing(canvas, this, 1, SK_AlphaOPAQUE);
 }
 
 int DownloadItemViewMd::GetYForFilenameText() const {
   int text_height = font_list_.GetBaseline();
   if (!status_text_.empty())
     text_height += kVerticalTextPadding + status_font_list_.GetBaseline();
   return (height() - text_height) / 2;
 }
 
 void DownloadItemViewMd::DrawStatusText(gfx::Canvas* canvas) {
@@ skipping 492 matching lines @@
     SchedulePaint();
 }
 
 SkColor DownloadItemViewMd::GetTextColor() const {
   return GetTextColorForThemeProvider(GetThemeProvider());
 }
 
 SkColor DownloadItemViewMd::GetDimmedTextColor() const {
   return SkColorSetA(GetTextColor(), 0xC7);
 }