Fix incorrect use of AXState caused when refactoring two enums into one.

ui/accessibility/ax_view_state.h

Index: ui/accessibility/ax_view_state.h
diff --git a/ui/accessibility/ax_view_state.h b/ui/accessibility/ax_view_state.h
index 2cb2152db930002fc6f6f6729d941c8da537ac0c..d718ae49716037381ebcb89db94079219de14827 100644
--- a/ui/accessibility/ax_view_state.h
+++ b/ui/accessibility/ax_view_state.h
@@ -26,13 +26,13 @@ struct AX_EXPORT AXViewState {
   AXViewState();
   ~AXViewState();
 
+  // Set or check bits in |state_|.
+  void SetStateFlag(ui::AXState state);

[sky, 2014/03/26 14:29:13]

nit: I think AddStateFlag would be a better name here.

[dmazzoni, 2014/03/26 18:12:29]

Done.

+  bool HasStateFlag(ui::AXState state) const;
+
   // The view's role, like button or list box.
   AXRole role;
 
-  // The view's state, a bitmask containing fields such as checked
-  // (for a checkbox) and protected (for a password text box).
-  uint32 state;
-
   // The view's name / label.
   base::string16 name;
 
@@ -66,6 +66,11 @@ struct AX_EXPORT AXViewState {
   // be a safe no-op if the view is deleted. Typically, accessible views
   // should use a WeakPtr when binding the callback.
   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_;
 };
 
 }  // namespace ui