Reland Extend AXTreeSourceViews to support views::Widget and aura::Window.

original cl
https://codereview.chromium.org/246433012/

BUG=309681
TBR=dtseng@chromium.org
NOTRY=true

Review URL: https://codereview.chromium.org/269593002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@267487 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 6 insertions, 2 deletions

diff --git a/ui/accessibility/ax_enums.idl b/ui/accessibility/ax_enums.idl
index 77287e3..ea46143 100644
--- a/ui/accessibility/ax_enums.idl
+++ b/ui/accessibility/ax_enums.idl
@@ -65,6 +65,7 @@ namespace ui {
     definition,
     description_list_detail,
     description_list_term,
+    desktop,
     dialog,
     directory,
     disclosure_triangle,
diff --git a/ui/accessibility/ax_view_state.h b/ui/accessibility/ax_view_state.h
index 5d72d47..2f1aab09 100644
--- a/ui/accessibility/ax_view_state.h
+++ b/ui/accessibility/ax_view_state.h
@@ -30,6 +30,11 @@ struct AX_EXPORT AXViewState {
   void AddStateFlag(ui::AXState state);
   bool HasStateFlag(ui::AXState state) const;
 
+  // The view's state, a bitmask containing fields such as checked
+  // (for a checkbox) and protected (for a password text box). This "state"
+  // should not be confused with the class's name.
+  uint32 state() { return state_; }
+
   // The view's role, like button or list box.
   AXRole role;
 
@@ -68,8 +73,6 @@ struct AX_EXPORT AXViewState {
   base::Callback<void(const base::string16&)> set_value_callback;
 
  private:
-  // The view's state, a bitmask containing fields such as checked
-  // (for a checkbox) and protected (for a password text box).
   uint32 state_;
 };