| Index: ui/views/view.cc
|
| diff --git a/ui/views/view.cc b/ui/views/view.cc
|
| index f260e37961559c75a7d47b296d239536b69e9910..920939e7593879ec8dfaf0a7c7e47ffade3cfa28 100644
|
| --- a/ui/views/view.cc
|
| +++ b/ui/views/view.cc
|
| @@ -898,7 +898,7 @@ bool View::IsFocusable() const {
|
| return focusable_ && enabled_ && IsDrawn();
|
| }
|
|
|
| -bool View::IsAccessibilityFocusableInRootView() const {
|
| +bool View::IsAccessibilityFocusable() const {
|
| return (focusable_ || accessibility_focusable_) && enabled_ && IsDrawn();
|
| }
|
|
|
| @@ -1093,7 +1093,7 @@ void View::OnPaintBorder(gfx::Canvas* canvas) {
|
| }
|
|
|
| void View::OnPaintFocusBorder(gfx::Canvas* canvas) {
|
| - if ((focusable() || IsAccessibilityFocusableInRootView()) && HasFocus()) {
|
| + if (HasFocus() && (focusable() || IsAccessibilityFocusable())) {
|
| TRACE_EVENT2("views", "views::OnPaintFocusBorder",
|
| "width", canvas->GetSkCanvas()->getDevice()->width(),
|
| "height", canvas->GetSkCanvas()->getDevice()->height());
|
|
|