6 files changed, 14 insertions, 11 deletions
diff --git a/chrome/common/extensions/api/_permission_features.json b/chrome/common/extensions/api/_permission_features.json
index 91077cf..09c5ad7 100644
--- a/chrome/common/extensions/api/_permission_features.json
+++ b/chrome/common/extensions/api/_permission_features.json
@@ -277,6 +277,9 @@
     ]
   },
   "notifications": {
+    // Note that the chrome.notifications API is currently restricted
+    // to dev channel, extension/platform_app. This isn't done through
+    // this file, but rather on a method-by-method basis.
     "channel": "stable",
     "extension_types": [
       "extension", "packaged_app", "hosted_app", "platform_app"
diff --git a/chrome/common/extensions/api/api.gyp b/chrome/common/extensions/api/api.gyp
index 62e9a2c..3ffa558 100644
--- a/chrome/common/extensions/api/api.gyp
+++ b/chrome/common/extensions/api/api.gyp
@@ -25,8 +25,8 @@
           'app_window.idl',
           'autotest_private.idl',
           'bluetooth.idl',
-          'bookmarks.json',
           'bookmark_manager_private.json',
+          'bookmarks.json',
           'chromeos_info_private.json',
           'cloud_print_private.json',
           'content_settings.json',
@@ -48,7 +48,6 @@
           'experimental_idltest.idl',
           'experimental_infobars.json',
           'experimental_media_galleries.idl',
-          'experimental_notification.idl',
           'experimental_power.json',
           'experimental_record.json',
           'experimental_system_info_cpu.idl',
@@ -67,8 +66,9 @@
           'media_galleries_private.idl',
           'media_player_private.json',
           'metrics_private.json',
-          'omnibox.json',
           'networking_private.json',
+          'notifications.idl',
+          'omnibox.json',
           'page_capture.json',
           'page_launcher.idl',
           'permissions.json',
@@ -89,10 +89,10 @@
           'top_sites.json',
           'usb.idl',
           'wallpaper_private.json',
-          'webview.json',
           'web_navigation.json',
           'web_request.json',
           'web_socket_proxy_private.json',
+          'webview.json',
           'windows.json',
         ],
         'cc_dir': 'chrome/common/extensions/api',
diff --git a/chrome/common/extensions/api/experimental_notification.idl b/chrome/common/extensions/api/notifications.idl
index e2e6867..9fdabdd 100644
--- a/chrome/common/extensions/api/experimental_notification.idl
+++ b/chrome/common/extensions/api/notifications.idl
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-namespace experimental.notification {
+namespace notifications {
   enum TemplateType {
     // icon, title, message
     simple,
diff --git a/chrome/common/extensions/docs/templates/intros/experimental_notification.html b/chrome/common/extensions/docs/templates/intros/notifications.html
index 8789e44..4a1ae70 100644
--- a/chrome/common/extensions/docs/templates/intros/experimental_notification.html
+++ b/chrome/common/extensions/docs/templates/intros/notifications.html
@@ -33,7 +33,7 @@ Currently this API only works on ChromeOS and Windows.
 
 <p>
 To use this API,
-call the $ref:experimental.notification.create method,
+call the $ref:notifications.create method,
 passing in the notification details
 via the <code>options</code> parameter:
 </p>
@@ -44,8 +44,8 @@ chrome.experimental.notification
 </pre>
 
 <p>
-The $ref:experimental.notification.NotificationOptions must include the
-$ref:experimental.notification.TemplateType
+The $ref:notifications.NotificationOptions must include the
+$ref:notifications.TemplateType
 which defines available notification details
 and how those details are displayed.
 All four available template types
@@ -112,10 +112,10 @@ all notifications can include event listeners and event handlers
 which respond to user actions.
 For example,
 you can write an event handler to respond to an
-$ref:experimental.notification.onButtonClicked event.
+$ref:notifications.onButtonClicked event.
 </p>
 
 <p>Consider including event listeners and handlers within the
   <a href="app_lifecycle.html#create_event_page">event page</a>,
 so that notifications can pop-up even when the app or extension isn't running.
-</p>
-\ No newline at end of file
+</p>
diff --git a/chrome/common/extensions/docs/templates/public/apps/experimental_notification.html b/chrome/common/extensions/docs/templates/public/apps/experimental_notification.html
deleted file mode 100644
index 6a6168e..0000000
--- a/chrome/common/extensions/docs/templates/public/apps/experimental_notification.html
+++ /dev/null
@@ -1 +0,0 @@
-{{+partials.standard_apps_api api:apis.experimental_notification intro:intros.experimental_notification}}
diff --git a/chrome/common/extensions/docs/templates/public/apps/notifications.html b/chrome/common/extensions/docs/templates/public/apps/notifications.html
new file mode 100644
index 0000000..b4f7d25
--- /dev/null
+++ b/chrome/common/extensions/docs/templates/public/apps/notifications.html
@@ -0,0 +1 @@
+{{+partials.standard_apps_api api:apis.notifications intro:intros.notifications}}