Replace ui::AXViewState with AXNodeData and AXActionData

chrome/browser/chromeos/ui/idle_app_name_notification_view.cc

 // Copyright 2014 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/chromeos/ui/idle_app_name_notification_view.h"
 
 #include <string>
 
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/shell.h"
 #include "ash/wm/window_animations.h"
 #include "base/macros.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
 #include "chrome/grit/generated_resources.h"
 #include "extensions/common/extension.h"
-#include "ui/accessibility/ax_view_state.h"
+#include "ui/accessibility/ax_node_data.h"
 #include "ui/aura/window.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/compositor/layer_animation_observer.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/font_list.h"
 #include "ui/gfx/text_utils.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/box_layout.h"
@@ skipping 136 matching lines @@
   }
 
   void OnPaint(gfx::Canvas* canvas) override {
     SkPaint paint;
     paint.setStyle(SkPaint::kFill_Style);
     paint.setColor(kWindowBackgroundColor);
     canvas->DrawRoundRect(GetLocalBounds(), kWindowCornerRadius, paint);
     views::WidgetDelegateView::OnPaint(canvas);
   }
 
-  void GetAccessibleState(ui::AXViewState* state) override {
-    state->name = spoken_text_;
-    state->role = ui::AX_ROLE_ALERT;
+  void GetAccessibleNodeData(ui::AXNodeData* node_data) override {
+    node_data->SetName(spoken_text_);
+    node_data->role = ui::AX_ROLE_ALERT;
   }
 
   // ImplicitAnimationObserver overrides
   void OnImplicitAnimationsCompleted() override { Close(); }
 
  private:
   // Adds the label to the view, using |text| with a |font| and a |text_color|.
   void AddLabel(const base::string16& text,
                 const gfx::FontList& font,
                 SkColor text_color) {
@@ skipping 41 matching lines @@
     view_ = NULL;
     view->Close();
   }
 }
 
 bool IdleAppNameNotificationView::IsVisible() {
   return view_ != NULL;
 }
 
 base::string16 IdleAppNameNotificationView::GetShownTextForTest() {
-  ui::AXViewState state;
+  ui::AXNodeData node_data;
   DCHECK(view_);
-  view_->GetAccessibleState(&state);
-  return state.name;
+  view_->GetAccessibleNodeData(&node_data);
+  return node_data.GetString16Attribute(ui::AX_ATTR_NAME);
 }
 
 void IdleAppNameNotificationView::ShowMessage(
     int message_visibility_time_in_ms,
     int animation_time_ms,
     const extensions::Extension* extension) {
   DCHECK(!view_);
 
   base::string16 app_name;
   bool error = false;
   if (extension &&
       !base::ContainsOnlyChars(extension->name(), base::kWhitespaceASCII)) {
     app_name = base::UTF8ToUTF16(extension->name());
   } else {
     error = true;
     app_name = l10n_util::GetStringUTF16(
         IDS_IDLE_APP_NAME_UNKNOWN_APPLICATION_NOTIFICATION);
   }
 
   view_ = new IdleAppNameNotificationDelegateView(
       this,
       app_name,
       error,
       message_visibility_time_in_ms + animation_time_ms);
   CreateAndShowWidget(view_, animation_time_ms);
 }
 
 }  // namespace chromeos