Index: ui/views/view.h |
diff --git a/ui/views/view.h b/ui/views/view.h |
index 3dfa2205ed982d8c7a46ec87d23f838fad3d9b7b..aba1194ea2f5b1ed3a77d42604437a39e2e6df84 100644 |
--- a/ui/views/view.h |
+++ b/ui/views/view.h |
@@ -773,9 +773,6 @@ class VIEWS_EXPORT View : public ui::LayerDelegate, |
// not get the focus. |
void SetFocusable(bool focusable); |
- // Returns true if this view is capable of taking focus. |
- bool focusable() const { return focusable_ && enabled_ && visible_; } |
- |
// Returns true if this view is |focusable_|, |enabled_| and drawn. |
virtual bool IsFocusable() const; |
@@ -1142,6 +1139,10 @@ class VIEWS_EXPORT View : public ui::LayerDelegate, |
// Focus --------------------------------------------------------------------- |
+ // Returns last value passed to SetFocusable(). Use IsFocusable() to determine |
+ // if a view can take focus right now. |
+ bool focusable() const { return focusable_; } |
+ |
// Override to be notified when focus has changed either to or from this View. |
virtual void OnFocus(); |
virtual void OnBlur(); |