Implement put_accvalue for textfields and location bar.

chrome/browser/ui/views/location_bar/location_bar_view.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 "chrome/browser/ui/views/location_bar/location_bar_view.h"
 
 #include <algorithm>
 #include <map>
 
 #include "base/command_line.h"
@@ skipping 172 matching lines @@
       keyword_hint_view_(NULL),
       mic_search_view_(NULL),
       zoom_view_(NULL),
       generated_credit_card_view_(NULL),
       open_pdf_in_reader_view_(NULL),
       script_bubble_icon_view_(NULL),
       star_view_(NULL),
       is_popup_mode_(is_popup_mode),
       show_focus_rect_(false),
       template_url_service_(NULL),
-      animation_offset_(0) {
+      animation_offset_(0),
+      weak_ptr_factory_(this) {
   if (!views::Textfield::IsViewsTextfieldEnabled())
     set_id(VIEW_ID_OMNIBOX);
 
   const int kOmniboxBorderImages[] = IMAGE_GRID(IDR_OMNIBOX_BORDER);
   const int kOmniboxPopupImages[] = IMAGE_GRID(IDR_OMNIBOX_POPUP_BORDER);
   background_border_painter_.reset(
       views::Painter::CreateImageGridPainter(
           is_popup_mode_ ? kOmniboxPopupImages : kOmniboxBorderImages));
 #if defined(OS_CHROMEOS)
   if (!is_popup_mode_) {
@@ skipping 12 matching lines @@
 
   if (browser_)
     browser_->search_model()->AddObserver(this);
 }
 
 LocationBarView::~LocationBarView() {
   if (template_url_service_)
     template_url_service_->RemoveObserver(this);
   if (browser_)
     browser_->search_model()->RemoveObserver(this);
+  weak_ptr_factory_.InvalidateWeakPtrs();

[sky, 2013/09/04 16:20:12]

Is there a reason you're explicitly invoking this?

[dmazzoni, 2013/09/04 17:16:18]

It's sometimes safer, as they might not be invalidated
while an object is being deleted - but in this case I
don't think it helps, I'll remove it.

 }
 
 // static
 void LocationBarView::InitTouchableLocationBarChildView(views::View* view) {
   int horizontal_padding = GetBuiltInHorizontalPaddingForChildViews();
   if (horizontal_padding != 0) {
     view->set_border(views::Border::CreateEmptyBorder(
         3, horizontal_padding, 3, horizontal_padding));
   }
 }
@@ skipping 1057 matching lines @@
     // mid-point between two page actions in the bounding rectangle.  For even
     // paddings, the +1 is dropped, which is right since there is no pixel at
     // the mid-point.
     bounds.Inset(-(horizontal_padding + 1) / 2, 0);
     location_bar_util::PaintExtensionActionBackground(
         *(*page_action_view)->image_view()->page_action(),
         tab_id, canvas, bounds, text_color, background_color);
   }
 }
 
+void LocationBarView::AccessibilitySetValue(const string16& new_value) {

[sky, 2013/09/04 16:20:12]

Make position match header.

[dmazzoni, 2013/09/04 17:16:18]

The order was all over the place. I moved all of the private
member function implementations to the correct place and 
correct order.

+  location_entry_->SetUserText(new_value);

[sky, 2013/09/04 16:20:12]

Does this need to do nothing if is_popup_mode_, or maybe the callback shouldn't
be set in that case?

[dmazzoni, 2013/09/04 17:16:18]

Good idea, I'll set the readonly flag if is_popup_mode is true, and not set the
callback.

+}
+
 const char* LocationBarView::GetClassName() const {
   return kViewClassName;
 }
 
 bool LocationBarView::SkipDefaultKeyEventProcessing(const ui::KeyEvent& event) {
 #if defined(OS_WIN)
   if (views::FocusManager::IsTabTraversalKeyEvent(event)) {
     if (location_entry_->model()->popup_model()->IsOpen()) {
       // Return true so that the edit sees the tab and moves the selection.
       return true;
@@ skipping 12 matching lines @@
     return omnibox_win->SkipDefaultKeyEventProcessing(event);
 #endif  // USE_AURA
 #endif  // OS_WIN
 
   // This method is not used for Linux ports. See FocusManager::OnKeyEvent() in
   // src/ui/views/focus/focus_manager.cc for details.
   return false;
 }
 
 void LocationBarView::GetAccessibleState(ui::AccessibleViewState* state) {
+  if (!location_entry_)
+    return;
+
   state->role = ui::AccessibilityTypes::ROLE_LOCATION_BAR;
   state->name = l10n_util::GetStringUTF16(IDS_ACCNAME_LOCATION);
   state->value = location_entry_->GetText();
 
   string16::size_type entry_start;
   string16::size_type entry_end;
   location_entry_->GetSelectionBounds(&entry_start, &entry_end);
   state->selection_start = entry_start;
   state->selection_end = entry_end;
+
+  state->set_value_callback =
+      base::Bind(&LocationBarView::AccessibilitySetValue,
+                 weak_ptr_factory_.GetWeakPtr());
 }
 
 bool LocationBarView::HasFocus() const {
   return location_entry_->model()->has_focus();
 }
 
 void LocationBarView::OnBoundsChanged(const gfx::Rect& previous_bounds) {
   if (browser_ && browser_->instant_controller() && parent())
     browser_->instant_controller()->SetOmniboxBounds(bounds());
   OmniboxPopupView* popup = location_entry_->model()->popup_model()->view();
@@ skipping 199 matching lines @@
 int LocationBarView::GetInternalHeight(bool use_preferred_size) {
   int total_height =
       use_preferred_size ? GetPreferredSize().height() : height();
   return std::max(total_height - (vertical_edge_thickness() * 2), 0);
 }
 
 bool LocationBarView::HasValidSuggestText() const {
   return suggested_text_view_->visible() &&
       !suggested_text_view_->size().IsEmpty();
 }