Chromium Code Reviews| Index: ui/views/view.cc |
| diff --git a/ui/views/view.cc b/ui/views/view.cc |
| index ee8be17e8e3c70e3ab0b47b0937e81d5b045f8fa..b0d38b99c33741c293a623e1ff9144f71a329517 100644 |
| --- a/ui/views/view.cc |
| +++ b/ui/views/view.cc |
| @@ -895,7 +895,7 @@ void View::SetNextFocusableView(View* view) { |
| } |
| bool View::IsFocusableInRootView() const { |
| - return IsFocusable() && IsDrawn(); |
| + return focusable() && IsDrawn(); |
|
Ben Goodger (Google)
2011/12/16 16:20:23
looks like you're skipping the check of enabled_ t
tfarina
2011/12/16 17:45:17
Done.
|
| } |
| bool View::IsAccessibilityFocusableInRootView() const { |
| @@ -1093,7 +1093,7 @@ void View::OnPaintBorder(gfx::Canvas* canvas) { |
| } |
| void View::OnPaintFocusBorder(gfx::Canvas* canvas) { |
| - if ((IsFocusable() || IsAccessibilityFocusableInRootView()) && HasFocus()) { |
| + if ((focusable() || IsAccessibilityFocusableInRootView()) && HasFocus()) { |
| TRACE_EVENT2("views", "views::OnPaintFocusBorder", |
| "width", canvas->GetSkCanvas()->getDevice()->width(), |
| "height", canvas->GetSkCanvas()->getDevice()->height()); |
| @@ -1229,10 +1229,6 @@ void View::GetHitTestMask(gfx::Path* mask) const { |
| // Focus ----------------------------------------------------------------------- |
| -bool View::IsFocusable() const { |
| - return focusable_ && enabled_ && visible_; |
| -} |
| - |
| void View::OnFocus() { |
| // TODO(beng): Investigate whether it's possible for us to move this to |
| // Focus(). |