Merge 221688 "Implement put_accvalue for textfields and location..."

ui/views/controls/textfield/textfield.h

Index: ui/views/controls/textfield/textfield.h
===================================================================
--- ui/views/controls/textfield/textfield.h	(revision 223520)
+++ ui/views/controls/textfield/textfield.h	(working copy)
@@ -9,6 +9,7 @@
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/memory/weak_ptr.h"
 #include "base/strings/string16.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
@@ -288,6 +289,11 @@
   // Returns the insets to the rectangle where text is actually painted.
   gfx::Insets GetTextInsets() const;
 
+  // Handles a request to change the value of this text field from software
+  // using an accessibility API (typically automation software, screen readers
+  // don't normally use this). Sets the value and clears the selection.
+  void AccessibilitySetValue(const string16& new_value);
+
   // This is the current listener for events from this Textfield.
   TextfieldController* controller_;
 
@@ -347,6 +353,9 @@
   // The duration to reveal the last typed char for obscured textfields.
   base::TimeDelta obscured_reveal_duration_;
 
+  // Used to bind callback functions to this object.
+  base::WeakPtrFactory<Textfield> weak_ptr_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(Textfield);
 };