Make use of new AX name calc in Chromium.

content/browser/accessibility/browser_accessibility_win.h

 // 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.
 
 #ifndef CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_WIN_H_
 #define CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_WIN_H_
 
 #include <atlbase.h>
 #include <atlcom.h>
 #include <oleacc.h>
@@ skipping 703 matching lines @@
   int32 ia_role() const { return win_attributes_->ia_role; }
   int32 ia_state() const { return win_attributes_->ia_state; }
   const base::string16& role_name() const { return win_attributes_->role_name; }
   int32 ia2_role() const { return win_attributes_->ia2_role; }
   int32 ia2_state() const { return win_attributes_->ia2_state; }
   const std::vector<base::string16>& ia2_attributes() const {
     return win_attributes_->ia2_attributes;
   }
   base::string16 name() const { return win_attributes_->name; }
   base::string16 description() const { return win_attributes_->description; }
-  base::string16 help() const { return win_attributes_->help; }
   base::string16 value() const { return win_attributes_->value; }
   base::string16 hypertext() const { return win_attributes_->hypertext; }
   std::map<int32, int32>& hyperlink_offset_to_index() const {
     return win_attributes_->hyperlink_offset_to_index;
   }
   std::vector<int32>& hyperlinks() const { return win_attributes_->hyperlinks; }
 
  private:
   // Add one to the reference count and return the same object. Always
   // use this method when returning a BrowserAccessibilityWin object as
@@ skipping 116 matching lines @@
   // does not make a new reference.
   BrowserAccessibilityWin* GetFromID(int32 id);
 
   // Returns true if this is a list box option with a parent of type list box,
   // or a menu list option with a parent of type menu list popup.
   bool IsListBoxOptionOrMenuListOption();
 
   // Updates object attributes of IA2 with html attributes.
   void UpdateRequiredAttributes();
 
+  void AddRelations(ui::AXIntListAttribute src_attr,

[aboxhall, 2015/11/13 23:13:49]

Comment for this to be consistent with other methods?

[dmazzoni, 2015/11/16 18:52:04]

Done.

+                    const base::string16& iaccessiblerelation_type);
+
   // Windows-specific unique ID (unique within the browser process),
   // used for get_accChild, NotifyWinEvent, and as the unique ID for
   // IAccessible2 and ISimpleDOM.
   LONG unique_id_win_;
 
   struct WinAttributes {
     WinAttributes();
     ~WinAttributes();
 
     // IAccessible role and state.
     int32 ia_role;
     int32 ia_state;
     base::string16 role_name;
 
     // IAccessible name, description, help, value.
     base::string16 name;
     base::string16 description;
-    base::string16 help;
     base::string16 value;
 
     // IAccessible2 role and state.
     int32 ia2_role;
     int32 ia2_state;
 
     // IAccessible2 attributes.
     std::vector<base::string16> ia2_attributes;
 
     // Hypertext.
@@ skipping 27 matching lines @@
   // Give BrowserAccessibility::Create access to our constructor.
   friend class BrowserAccessibility;
   friend class BrowserAccessibilityRelation;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserAccessibilityWin);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_WIN_H_