Fixing focus highlight on high DPI devices for accessibility

ash/shelf/shelf_view.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 "ash/shelf/shelf_view.h"
 
 #include <algorithm>
 
 #include "ash/ash_constants.h"
 #include "ash/ash_switches.h"
@@ skipping 223 matching lines @@
     }
     return view_model_->view_at(index);
   }
 
  private:
   views::ViewModel* view_model_;
 
   DISALLOW_COPY_AND_ASSIGN(LauncherFocusSearch);
 };
 
-class ShelfButtonFocusBorder : public views::FocusBorder {
- public:
-  ShelfButtonFocusBorder() {}
-  virtual ~ShelfButtonFocusBorder() {}
-
- private:
-  // views::FocusBorder overrides:
-  virtual void Paint(const View& view, gfx::Canvas* canvas) const OVERRIDE {
-    gfx::Rect rect(view.GetLocalBounds());
-    rect.Inset(1, 1);
-    canvas->DrawRect(rect, kFocusBorderColor);
-  }
-
-  DISALLOW_COPY_AND_ASSIGN(ShelfButtonFocusBorder);
-};
-
 // AnimationDelegate used when inserting a new item. This steadily increases the
 // opacity of the layer as the animation progress.
 class FadeInAnimationDelegate
     : public views::BoundsAnimator::OwnedAnimationDelegate {
  public:
   explicit FadeInAnimationDelegate(views::View* view) : view_(view) {}
   virtual ~FadeInAnimationDelegate() {}
 
   // AnimationDelegate overrides:
   virtual void AnimationProgressed(const Animation* animation) OVERRIDE {
@@ skipping 677 matching lines @@
                 views::ImageButton::ALIGN_BOTTOM));
         view = button;
       }
       break;
     }
 
     default:
       break;
   }
   view->set_context_menu_controller(this);
-  view->set_focus_border(new ShelfButtonFocusBorder);
+  view->set_focus_border(views::FocusBorder::CreateSolidFocusBorder(
+      kFocusBorderColor,
+      gfx::Insets(1, 1, 1, 1)));
 
   DCHECK(view);
   ConfigureChildView(view);
   return view;
 }
 
 void ShelfView::FadeIn(views::View* view) {
   view->SetVisible(true);
   view->layer()->SetOpacity(0);
   AnimateToIdealBounds();
@@ skipping 999 matching lines @@
       break;
     case ash::SHELF_ALIGNMENT_TOP:
       distance = coordinate.y() - bounds.bottom();
       break;
   }
   return distance > 0 ? distance : 0;
 }
 
 }  // namespace internal
 }  // namespace ash