Replace ui::AXViewState with AXNodeData and AXActionData

ui/accessibility/platform/ax_platform_node_mac.mm

 // 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.
 
 #import "ui/accessibility/platform/ax_platform_node_mac.h"
 
 #import <Cocoa/Cocoa.h>
 #include <stddef.h>
 
 #include "base/macros.h"
 #include "base/strings/sys_string_conversions.h"
 #include "ui/accessibility/ax_node_data.h"
-#include "ui/accessibility/ax_view_state.h"
 #include "ui/accessibility/platform/ax_platform_node_delegate.h"
 #import "ui/gfx/mac/coordinate_conversion.h"
 
 namespace {
 
 struct RoleMapEntry {
   ui::AXRole value;
   NSString* nativeValue;
 };
 
@@ skipping 352 matching lines @@
       [attributeName
           isEqualToString:NSAccessibilityVisibleCharacterRangeAttribute]) {
     return NO;
   }
 
   if ([attributeName isEqualToString:NSAccessibilityValueAttribute] ||
       [attributeName isEqualToString:NSAccessibilitySelectedTextAttribute])
     return node_->GetDelegate()->CanSetStringValue();
 
   if ([attributeName isEqualToString:NSAccessibilityFocusedAttribute]) {
-    if (ui::AXViewState::IsFlagSet(node_->GetData().state,
-                                   ui::AX_STATE_FOCUSABLE))
+    if (ui::AXNodeData::IsFlagSet(node_->GetData().state,
+                                  ui::AX_STATE_FOCUSABLE))
       return NO;
   }
 
   // TODO(patricialor): Add callbacks for updating the above attributes except
   // NSAccessibilityValueAttribute and return YES.
   return NO;
 }
 
 - (void)accessibilitySetValue:(id)value forAttribute:(NSString*)attribute {
   if ([attribute isEqualToString:NSAccessibilityValueAttribute] &&
@@ skipping 41 matching lines @@
 - (NSString*)AXRole {
   if (!node_)
     return nil;
   return [[self class] nativeRoleFromAXRole:node_->GetData().role];
 }
 
 - (NSString*)AXSubrole {
   ui::AXRole role = node_->GetData().role;
   switch (role) {
     case ui::AX_ROLE_TEXT_FIELD:
-      if (ui::AXViewState::IsFlagSet(node_->GetData().state,
-                                     ui::AX_STATE_PROTECTED))
+      if (ui::AXNodeData::IsFlagSet(node_->GetData().state,
+                                    ui::AX_STATE_PROTECTED))
         return NSAccessibilitySecureTextFieldSubrole;
       break;
     default:
       break;
   }
   return [AXPlatformNodeCocoa nativeSubroleFromAXRole:role];
 }
 
 - (NSString*)AXRoleDescription {
   return NSAccessibilityRoleDescription([self AXRole], [self AXSubrole]);
 }
 
 - (NSValue*)AXSize {
   return [NSValue valueWithSize:self.boundsInScreen.size];
 }
 
 - (NSString*)AXTitle {
   return [self getStringAttribute:ui::AX_ATTR_NAME];
 }
 
 - (NSString*)AXValue {
   return [self getStringAttribute:ui::AX_ATTR_VALUE];
 }
 
 - (NSValue*)AXEnabled {
   return [NSNumber
-      numberWithBool:!ui::AXViewState::IsFlagSet(node_->GetData().state,
-                                                 ui::AX_STATE_DISABLED)];
+      numberWithBool:!ui::AXNodeData::IsFlagSet(node_->GetData().state,
+                                                ui::AX_STATE_DISABLED)];
 }
 
 - (NSValue*)AXFocused {
-  if (ui::AXViewState::IsFlagSet(node_->GetData().state,
-                                 ui::AX_STATE_FOCUSABLE))
+  if (ui::AXNodeData::IsFlagSet(node_->GetData().state,
+                                ui::AX_STATE_FOCUSABLE))
     return [NSNumber numberWithBool:(node_->GetDelegate()->GetFocus() ==
                                      node_->GetNativeViewAccessible())];
   return [NSNumber numberWithBool:NO];
 }
 
 - (NSString*)AXHelp {
   return [self getStringAttribute:ui::AX_ATTR_DESCRIPTION];
 }
 
 - (NSWindow*)AXTopLevelUIElement {
@@ skipping 91 matching lines @@
   }
   NotifyMacEvent(native_node_, event_type);
 }
 
 int AXPlatformNodeMac::GetIndexInParent() {
   // TODO(dmazzoni): implement this.  http://crbug.com/396137
   return -1;
 }
 
 }  // namespace ui