Replace ui::AXViewState with AXNodeData and AXActionData

chrome/browser/ui/views/omnibox/omnibox_result_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.
 
 // For WinDDK ATL compatibility, these ATL headers must come first.
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <atlbase.h>  // NOLINT
 #include <atlwin.h>  // NOLINT
@@ skipping 10 matching lines @@
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "chrome/browser/ui/layout_constants.h"
 #include "chrome/browser/ui/views/location_bar/background_with_1_px_border.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/grit/components_scaled_resources.h"
 #include "components/omnibox/browser/omnibox_popup_model.h"
 #include "third_party/skia/include/core/SkColor.h"
-#include "ui/accessibility/ax_view_state.h"
+#include "ui/accessibility/ax_node_data.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/theme_provider.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/gfx/range/range.h"
 #include "ui/gfx/render_text.h"
@@ skipping 220 matching lines @@
   separator_rendertext_.reset();
   keyword_contents_rendertext_.reset();
   keyword_description_rendertext_.reset();
 }
 
 void OmniboxResultView::OnSelected() {
   DCHECK_EQ(SELECTED, GetState());
 
   // Notify assistive technology when results with answers attached are
   // selected. The non-answer text is already accessible as a consequence of
-  // updating the text in the omnibox but this alert and GetAccessibleState
+  // updating the text in the omnibox but this alert and GetAccessibleNodeData
   // below make the answer contents accessible.
   if (match_.answer)
     NotifyAccessibilityEvent(ui::AX_EVENT_ALERT, true);
 }
 
 gfx::Size OmniboxResultView::GetPreferredSize() const {
   if (!match_.answer)
     return gfx::Size(0, GetContentLineHeight());
   // An answer implies a match and a description in a large font.
   if (match_.answer->second_line().num_text_lines() == 1)
     return gfx::Size(0, GetContentLineHeight() + GetAnswerLineHeight());
   if (!description_rendertext_) {
     description_rendertext_ =
         CreateAnswerLine(match_.answer->second_line(), font_list_);
   }
   description_rendertext_->SetDisplayRect(
       gfx::Rect(text_bounds_.width(), 0));
   description_rendertext_->GetStringSize();
   return gfx::Size(
       0, GetContentLineHeight() +
              GetAnswerLineHeight() * description_rendertext_->GetNumLines());
 }
 
-void OmniboxResultView::GetAccessibleState(ui::AXViewState* state) {
-  state->name = match_.answer
-                    ? l10n_util::GetStringFUTF16(
-                          IDS_OMNIBOX_ACCESSIBLE_ANSWER, match_.contents,
-                          match_.answer->second_line().AccessibleText())
-                    : match_.contents;
+void OmniboxResultView::GetAccessibleNodeData(ui::AXNodeData* node_data) {
+  node_data->SetName(match_.answer
+                         ? l10n_util::GetStringFUTF16(
+                               IDS_OMNIBOX_ACCESSIBLE_ANSWER, match_.contents,
+                               match_.answer->second_line().AccessibleText())
+                         : match_.contents);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // OmniboxResultView, protected:
 
 OmniboxResultView::ResultViewState OmniboxResultView::GetState() const {
   if (model_->IsSelectedIndex(model_index_))
     return SELECTED;
   return model_->IsHoveredIndex(model_index_) ? HOVERED : NORMAL;
 }
@@ skipping 453 matching lines @@
   destination->AppendText(text);
   const TextStyle& text_style = GetTextStyle(text_type);
   // TODO(dschuyler): follow up on the problem of different font sizes within
   // one RenderText.  Maybe with destination->SetFontList(...).
   destination->ApplyWeight(
       is_bold ? gfx::Font::Weight::BOLD : gfx::Font::Weight::NORMAL, range);
   destination->ApplyColor(
       GetNativeTheme()->GetSystemColor(text_style.colors[GetState()]), range);
   destination->ApplyBaselineStyle(text_style.baseline, range);
 }