Add a context field to the accessibility extension API.

chrome/browser/accessibility/accessibility_events.cc

Index: chrome/browser/accessibility/accessibility_events.cc
===================================================================
--- chrome/browser/accessibility/accessibility_events.cc	(revision 112880)
+++ chrome/browser/accessibility/accessibility_events.cc	(working copy)
@@ -33,8 +33,10 @@
 }
 
 AccessibilityControlInfo::AccessibilityControlInfo(
-    Profile* profile, const std::string& control_name)
-    : AccessibilityEventInfo(profile), name_(control_name) {
+    Profile* profile, const std::string& name, const std::string& context)
+    : AccessibilityEventInfo(profile),
+      name_(name),
+      context_(context) {
 }
 
 AccessibilityControlInfo::~AccessibilityControlInfo() {
@@ -43,11 +45,13 @@
 void AccessibilityControlInfo::SerializeToDict(DictionaryValue *dict) const {
   dict->SetString(keys::kNameKey, name_);
   dict->SetString(keys::kTypeKey, type());
+  if (!context_.empty())
+    dict->SetString(keys::kContextKey, context_);
 }
 
 AccessibilityWindowInfo::AccessibilityWindowInfo(Profile* profile,
                                                  const std::string& window_name)
-    : AccessibilityControlInfo(profile, window_name) {
+    : AccessibilityControlInfo(profile, window_name, std::string()) {
 }
 
 const char* AccessibilityWindowInfo::type() const {
@@ -55,8 +59,9 @@
 }
 
 AccessibilityButtonInfo::AccessibilityButtonInfo(Profile* profile,
-                                                 const std::string& button_name)
-    : AccessibilityControlInfo(profile, button_name) {
+                                                 const std::string& button_name,
+                                                 const std::string& context)
+    : AccessibilityControlInfo(profile, button_name, context) {
 }
 
 const char* AccessibilityButtonInfo::type() const {
@@ -64,8 +69,9 @@
 }
 
 AccessibilityLinkInfo::AccessibilityLinkInfo(Profile* profile,
-                                             const std::string& link_name)
-      : AccessibilityControlInfo(profile, link_name) { }
+                                             const std::string& link_name,
+                                             const std::string& context)
+    : AccessibilityControlInfo(profile, link_name, context) { }
 
 const char* AccessibilityLinkInfo::type() const {
   return keys::kTypeLink;
@@ -74,10 +80,11 @@
 AccessibilityRadioButtonInfo::AccessibilityRadioButtonInfo(
     Profile* profile,
     const std::string& name,
+    const std::string& context,
     bool checked,
     int item_index,
     int item_count)
-    : AccessibilityControlInfo(profile, name),
+    : AccessibilityControlInfo(profile, name, context),
       checked_(checked),
       item_index_(item_index),
       item_count_(item_count) {
@@ -97,8 +104,9 @@
 
 AccessibilityCheckboxInfo::AccessibilityCheckboxInfo(Profile* profile,
                                                      const std::string& name,
+                                                     const std::string& context,
                                                      bool checked)
-    : AccessibilityControlInfo(profile, name),
+    : AccessibilityControlInfo(profile, name, context),
       checked_(checked) {
 }
 
@@ -113,9 +121,10 @@
 
 AccessibilityTabInfo::AccessibilityTabInfo(Profile* profile,
                                            const std::string& tab_name,
+                                           const std::string& context,
                                            int tab_index,
                                            int tab_count)
-    : AccessibilityControlInfo(profile, tab_name),
+    : AccessibilityControlInfo(profile, tab_name, context),
       tab_index_(tab_index),
       tab_count_(tab_count) {
 }
@@ -132,10 +141,11 @@
 
 AccessibilityComboBoxInfo::AccessibilityComboBoxInfo(Profile* profile,
                                                      const std::string& name,
+                                                     const std::string& context,
                                                      const std::string& value,
                                                      int item_index,
                                                      int item_count)
-    : AccessibilityControlInfo(profile, name),
+    : AccessibilityControlInfo(profile, name, context),
       value_(value),
       item_index_(item_index),
       item_count_(item_count) {
@@ -154,8 +164,9 @@
 
 AccessibilityTextBoxInfo::AccessibilityTextBoxInfo(Profile* profile,
                                                    const std::string& name,
+                                                   const std::string& context,
                                                    bool password)
-    : AccessibilityControlInfo(profile, name),
+    : AccessibilityControlInfo(profile, name, context),
       value_(""),
       password_(password),
       selection_start_(0),
@@ -176,10 +187,11 @@
 
 AccessibilityListBoxInfo::AccessibilityListBoxInfo(Profile* profile,
                                                    const std::string& name,
+                                                   const std::string& context,
                                                    const std::string& value,
                                                    int item_index,
                                                    int item_count)
-    : AccessibilityControlInfo(profile, name),
+    : AccessibilityControlInfo(profile, name, context),
       value_(value),
       item_index_(item_index),
       item_count_(item_count) {
@@ -228,7 +240,7 @@
 
 AccessibilityMenuInfo::AccessibilityMenuInfo(Profile* profile,
                                              const std::string& menu_name)
-    : AccessibilityControlInfo(profile, menu_name) {
+    : AccessibilityControlInfo(profile, menu_name, std::string()) {
 }
 
 const char* AccessibilityMenuInfo::type() const {
@@ -237,10 +249,11 @@
 
 AccessibilityMenuItemInfo::AccessibilityMenuItemInfo(Profile* profile,
                                                      const std::string& name,
+                                                     const std::string& context,
                                                      bool has_submenu,
                                                      int item_index,
                                                      int item_count)
-    : AccessibilityControlInfo(profile, name),
+    : AccessibilityControlInfo(profile, name, context),
       has_submenu_(has_submenu),
       item_index_(item_index),
       item_count_(item_count) {