Fixing focus highlight on high DPI devices for accessibility

ui/message_center/views/padded_button.cc

 // Copyright 2013 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/message_center/views/padded_button.h"
 
 #include "grit/ui_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/message_center/message_center_style.h"
 #include "ui/views/controls/button/image_button.h"
 
 namespace message_center {
 
 PaddedButton::PaddedButton(views::ButtonListener* listener)
   : views::ImageButton(listener) {
   set_focusable(true);
   set_request_focus_on_press(false);
+  set_focus_border(views::FocusBorder::CreateSolidFocusBorder(
+      kFocusBorderColor,
+      gfx::Insets(1, 2, 2, 2)));
 }
 
 PaddedButton::~PaddedButton() {
 }
 
 void PaddedButton::SetPadding(int horizontal_padding, int vertical_padding) {
   padding_.Set(std::max(vertical_padding, 0),
                std::max(horizontal_padding, 0),
                std::max(-vertical_padding, 0),
                std::max(-horizontal_padding, 0));
@@ skipping 37 matching lines @@
       canvas->DrawImageInt(overlay_image_, position.x(), position.y());
   }
   OnPaintFocusBorder(canvas);
 }
 
 void PaddedButton::OnFocus() {
   views::ImageButton::OnFocus();
   ScrollRectToVisible(GetLocalBounds());
 }
 
-void PaddedButton::OnPaintFocusBorder(gfx::Canvas* canvas) {
-  if (HasFocus()) {
-    canvas->DrawRect(gfx::Rect(2, 1, width() - 4, height() - 3),
-                     message_center::kFocusBorderColor);
-  }
-}
-
 gfx::Point PaddedButton::ComputePaddedImagePaintPosition(
     const gfx::ImageSkia& image) {
   gfx::Vector2d offset;
   gfx::Rect bounds = GetContentsBounds();
   bounds.Inset(padding_);
 
   if (padding_.left() == 0 && padding_.right() == 0)
     offset.set_x((bounds.width() - image.width()) / 2);  // Center align.
   else if (padding_.right() > 0)
     offset.set_x(bounds.width() - image.width());  // Right align.
 
   if (padding_.top() == 0 && padding_.bottom() == 0)
     offset.set_y((bounds.height() - image.height()) / 2);  // Middle align.
   else if (padding_.bottom() > 0)
     offset.set_y(bounds.height() - image.height());  // Bottom align.
 
   return bounds.origin() + offset;
 }
 
 }  // namespace message_center