3 files changed, 36 insertions, 49 deletions
diff --git a/chrome/common/chrome_notification_types.h b/chrome/common/chrome_notification_types.h
index d508a43..90f06c3 100644
--- a/chrome/common/chrome_notification_types.h
+++ b/chrome/common/chrome_notification_types.h
@@ -668,21 +668,6 @@ enum NotificationType {
   // Details will be an AccessibilityMenuInfo.
   NOTIFICATION_ACCESSIBILITY_MENU_CLOSED,
 
-  // Notification that the volume was changed, for propagating
-  // to an accessibility extension.
-  // Details will be an AccessibilityVolumeInfo.
-  NOTIFICATION_ACCESSIBILITY_VOLUME_CHANGED,
-
-  // Notification that the screen is unlocked, for propagating to an
-  // accessibility extension.
-  // Details will be an AccessibilityEmptyEventInfo.
-  NOTIFICATION_ACCESSIBILITY_SCREEN_UNLOCKED,
-
-  // Notification that the system woke up from sleep, for propagating to an
-  // accessibility extension.
-  // Details will be an AccessibilityEmptyEventInfo.
-  NOTIFICATION_ACCESSIBILITY_WOKE_UP,
-
   // Content Settings --------------------------------------------------------
 
   // Sent when content settings change. The source is a HostContentSettings
diff --git a/chrome/common/extensions/api/experimental.accessibility.json b/chrome/common/extensions/api/experimental.accessibility.json
index d999566..eaf950a 100644
--- a/chrome/common/extensions/api/experimental.accessibility.json
+++ b/chrome/common/extensions/api/experimental.accessibility.json
@@ -113,15 +113,6 @@
         }
       },
       {
-        "id": "AccessibilityVolumeInfo",
-        "type": "object",
-        "description": "Information about the volume.",
-        "properties": {
-          "volume": {"type": "double", "description": "The value of the volume percent. This must be between 0.0 and 100.0."},
-          "isVolumeMuted": {"type": "boolean", "description": "True if the volume is muted."}
-        }
-      },
-      {
         "id": "AlertInfo",
         "type": "object",
         "description": "Information about an alert",
@@ -276,30 +267,6 @@
             "description": "Information about the menu that was closed."
           }
         ]
-      },
-      {
-        "name": "onVolumeChanged",
-        "type": "function",
-        "description": "Fired when the volume is changed.",
-        "parameters": [
-          {
-            "$ref": "AccessibilityVolumeInfo",
-            "name": "volume",
-            "description": "Information about the current state of the system volume control, including whether it is muted."
-          }
-        ]
-      },
-      {
-        "name": "onScreenUnlocked",
-        "type": "function",
-        "description": "Fired when the screen is unlocked.",
-        "parameters": []
-      },
-      {
-        "name": "onWokeUp",
-        "type": "function",
-        "description": "Fired when the device wakes up from sleep.",
-        "parameters": []
       }
     ]
   }
diff --git a/chrome/common/extensions/api/systemPrivate.json b/chrome/common/extensions/api/systemPrivate.json
index 608a5a0..9f8f007 100644
--- a/chrome/common/extensions/api/systemPrivate.json
+++ b/chrome/common/extensions/api/systemPrivate.json
@@ -13,11 +13,20 @@
             "enum": ["NotAvailable", "Updating", "NeedRestart"],
             "description": "State of system update.  NotAvailable when there is no available update or the update system is in error state, Updating when a system update is in progress, NeedRestart when a system update is finished and restart is needed."
           },
-          "download_progress": {
+          "downloadProgress": {
             "type": "number",
             "description": "Value between 0 and 1 describing the progress of system update download.  This value will be set to 0 when |state| is NotAvailable, 1 when NeedRestart."
           }
         }
+      },
+      {
+        "id": "VolumeInfo",
+        "type": "object",
+        "description": "Information about the volume.",
+        "properties": {
+          "volume": {"type": "double", "description": "The value of the volume percent. This must be between 0.0 and 100.0."},
+          "isVolumeMuted": {"type": "boolean", "description": "True if the volume is muted."}
+        }
       }
     ],
     "functions": [
@@ -59,6 +68,32 @@
           }
         ]
       }
+    ],
+    "events": [
+      {
+        "name": "onVolumeChanged",
+        "type": "function",
+        "description": "Fired when the volume is changed.",
+        "parameters": [
+          {
+            "$ref": "VolumeInfo",
+            "name": "volume",
+            "description": "Information about the current state of the system volume control, including whether it is muted."
+          }
+        ]
+      },
+      {
+        "name": "onScreenUnlocked",
+        "type": "function",
+        "description": "Fired when the screen is unlocked.",
+        "parameters": []
+      },
+      {
+        "name": "onWokeUp",
+        "type": "function",
+        "description": "Fired when the device wakes up from sleep.",
+        "parameters": []
+      }
     ]
   }
 ]