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

ui/views/controls/textfield/textfield.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/controls/textfield/textfield.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/strings/string_util.h"
@@ skipping 71 matching lines @@
       default_width_in_chars_(0),
       draw_border_(true),
       text_color_(SK_ColorBLACK),
       use_default_text_color_(true),
       background_color_(SK_ColorWHITE),
       use_default_background_color_(true),
       horizontal_margins_were_set_(false),
       vertical_margins_were_set_(false),
       vertical_alignment_(gfx::ALIGN_VCENTER),
       placeholder_text_color_(kDefaultPlaceholderTextColor),
-      text_input_type_(ui::TEXT_INPUT_TYPE_TEXT) {
+      text_input_type_(ui::TEXT_INPUT_TYPE_TEXT),
+      weak_ptr_factory_(this) {
   set_focusable(true);
 
   if (ViewsDelegate::views_delegate) {
     obscured_reveal_duration_ = ViewsDelegate::views_delegate->
         GetDefaultTextfieldObscuredRevealDuration();
   }
 }
 
 Textfield::Textfield(StyleFlags style)
     : native_wrapper_(NULL),
       controller_(NULL),
       style_(style),
       font_list_(GetDefaultFontList()),
       read_only_(false),
       default_width_in_chars_(0),
       draw_border_(true),
       text_color_(SK_ColorBLACK),
       use_default_text_color_(true),
       background_color_(SK_ColorWHITE),
       use_default_background_color_(true),
       horizontal_margins_were_set_(false),
       vertical_margins_were_set_(false),
       vertical_alignment_(gfx::ALIGN_VCENTER),
       placeholder_text_color_(kDefaultPlaceholderTextColor),
-      text_input_type_(ui::TEXT_INPUT_TYPE_TEXT) {
+      text_input_type_(ui::TEXT_INPUT_TYPE_TEXT),
+      weak_ptr_factory_(this) {
   set_focusable(true);
   if (IsObscured())
     SetTextInputType(ui::TEXT_INPUT_TYPE_PASSWORD);
 
   if (ViewsDelegate::views_delegate) {
     obscured_reveal_duration_ = ViewsDelegate::views_delegate->
         GetDefaultTextfieldObscuredRevealDuration();
   }
 }
 
@@ skipping 371 matching lines @@
   state->name = accessible_name_;
   if (read_only())
     state->state |= ui::AccessibilityTypes::STATE_READONLY;
   if (IsObscured())
     state->state |= ui::AccessibilityTypes::STATE_PROTECTED;
   state->value = text_;
 
   const ui::Range range = native_wrapper_->GetSelectedRange();
   state->selection_start = range.start();
   state->selection_end = range.end();
+
+  if (!read_only()) {
+    state->set_value_callback =
+        base::Bind(&Textfield::AccessibilitySetValue,
+                   weak_ptr_factory_.GetWeakPtr());
+  }
 }
 
 ui::TextInputClient* Textfield::GetTextInputClient() {
   return native_wrapper_ ? native_wrapper_->GetTextInputClient() : NULL;
 }
 
 void Textfield::OnEnabledChanged() {
   View::OnEnabledChanged();
   if (native_wrapper_)
     native_wrapper_->UpdateEnabled();
@@ skipping 21 matching lines @@
     if (!IsViewsTextfieldEnabled())
       static_cast<NativeTextfieldWin*>(native_wrapper_)->AttachHack();
 #endif
   }
 }
 
 const char* Textfield::GetClassName() const {
   return kViewClassName;
 }
 
+////////////////////////////////////////////////////////////////////////////////
+// Textfield, private:
+
 gfx::Insets Textfield::GetTextInsets() const {
   gfx::Insets insets = GetInsets();
   if (draw_border_ && native_wrapper_)
     insets += native_wrapper_->CalculateInsets();
   return insets;
 }
 
+void Textfield::AccessibilitySetValue(const string16& new_value) {
+  if (!read_only()) {
+    SetText(new_value);
+    ClearSelection();
+  }
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // NativeTextfieldWrapper, public:
 
 // static
 NativeTextfieldWrapper* NativeTextfieldWrapper::CreateWrapper(
     Textfield* field) {
 #if defined(OS_WIN) && !defined(USE_AURA)
   if (!Textfield::IsViewsTextfieldEnabled())
     return new NativeTextfieldWin(field);
 #endif
   return new NativeTextfieldViews(field);
 }
 
 }  // namespace views