Index: ui/views/view.h |
diff --git a/ui/views/view.h b/ui/views/view.h |
index fcbee85c1bf2155eef7639c5b96e75c6980c1b4f..68258ab5ab623638075521049dd800939785ee8d 100644 |
--- a/ui/views/view.h |
+++ b/ui/views/view.h |
@@ -807,7 +807,8 @@ class VIEWS_EXPORT View : public ui::LayerDelegate, |
// IMPORTANT NOTE: loops in the focus hierarchy are not supported. |
void SetNextFocusableView(View* view); |
- // Sets |focus_behavior| and advances focus if necessary. |
+ // Gets/sets |focus_behavior|. SetFocusBehavior() advances focus if necessary. |
+ FocusBehavior focus_behavior() const { return focus_behavior_; } |
void SetFocusBehavior(FocusBehavior focus_behavior); |
// Returns true if this view is focusable, |enabled_| and drawn. |
@@ -1182,9 +1183,6 @@ class VIEWS_EXPORT View : public ui::LayerDelegate, |
// Focus --------------------------------------------------------------------- |
- // Returns last set focus behavior. |
- FocusBehavior focus_behavior() const { return focus_behavior_; } |
- |
// Override to be notified when focus has changed either to or from this View. |
virtual void OnFocus(); |
virtual void OnBlur(); |
@@ -1616,9 +1614,8 @@ class VIEWS_EXPORT View : public ui::LayerDelegate, |
// Accessibility ------------------------------------------------------------- |
- // Belongs to this view, but it's reference-counted on some platforms |
- // so we can't use a scoped_ptr. It's dereferenced in the destructor. |
- NativeViewAccessibility* native_view_accessibility_; |
+ // The accessibility element used to represent this View. |
+ std::unique_ptr<NativeViewAccessibility> native_view_accessibility_; |
// Observers ------------------------------------------------------------- |