7 files changed, 56 insertions, 10 deletions
diff --git a/chrome/browser/extensions/extension_idle_apitest.cc b/chrome/browser/extensions/extension_idle_apitest.cc
index 89d7c3b..03406ce 100644
--- a/chrome/browser/extensions/extension_idle_apitest.cc
+++ b/chrome/browser/extensions/extension_idle_apitest.cc
@@ -8,8 +8,5 @@
 #include "net/base/mock_host_resolver.h"
 
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, Idle) {
-  CommandLine::ForCurrentProcess()->AppendSwitch(
-      switches::kEnableExperimentalExtensionApis);
-
   ASSERT_TRUE(RunExtensionTest("idle")) << message_;
 }
diff --git a/chrome/common/extensions/docs/idle.html b/chrome/common/extensions/docs/idle.html
index 353ecb0..04b57a7 100644
--- a/chrome/common/extensions/docs/idle.html
+++ b/chrome/common/extensions/docs/idle.html
@@ -15,7 +15,7 @@
     </script>
     <script type="text/javascript" src="js/api_page_generator.js"></script>
     <script type="text/javascript" src="js/bootstrap.js"></script>
-  <title>chrome.idle - Google Chrome Extensions - Google Code</title></head><body>  <div id="gc-container" class="labs">
+  <title>Idle - Google Chrome Extensions - Google Code</title></head><body>  <div id="gc-container" class="labs">
       <div id="devModeWarning">
         You are viewing extension docs in chrome via the 'file:' scheme: are you expecting to see local changes when you refresh? You'll need run chrome with --allow-file-access-from-files.
       </div>
@@ -208,16 +208,16 @@
 
     <div class="g-unit" id="gc-pagecontent">
       <div id="pageTitle">
-        <h1 class="page_title">chrome.idle</h1>
+        <h1 class="page_title">Idle</h1>
       </div>
         <!-- TABLE OF CONTENTS -->
         <div id="toc">
           <h2>Contents</h2>
           <ol>
-            <li style="display: none; ">
-              <a>h2Name</a>
+            <li>
+              <a href="#manifest">Manifest</a>
               <ol>
-                <li>
+                <li style="display: none; ">
                   <a>h3Name</a>
                 </li>
               </ol>
@@ -264,7 +264,25 @@
         <!-- /TABLE OF CONTENTS -->
 
         <!-- STATIC CONTENT PLACEHOLDER -->
-        <div id="static"></div>
+        <div id="static"><div id="pageData-name" class="pageData">Idle</div>
+
+<!-- BEGIN AUTHORED CONTENT -->
+<h2 id="manifest">Manifest</h2>
+<p>You must declare the "idle" permission in your extension's manifest to use the idle API.
+For example:
+</p>
+
+<pre>{
+  "name": "My extension",
+  ...
+  <b>"permissions": [
+    "idle"
+  ]</b>,
+  ...
+}</pre>
+
+<!-- END AUTHORED CONTENT -->
+</div>
 
         <!-- API PAGE -->
         <div class="apiPage">
diff --git a/chrome/common/extensions/docs/static/idle.html b/chrome/common/extensions/docs/static/idle.html
new file mode 100644
index 0000000..10f7e1d
--- /dev/null
+++ b/chrome/common/extensions/docs/static/idle.html
@@ -0,0 +1,18 @@
+<div id="pageData-name" class="pageData">Idle</div>
+
+<!-- BEGIN AUTHORED CONTENT -->
+<h2 id="manifest">Manifest</h2>
+<p>You must declare the "idle" permission in your extension's manifest to use the idle API.
+For example:
+</p>
+
+<pre>{
+  "name": "My extension",
+  ...
+  <b>"permissions": [
+    "idle"
+  ]</b>,
+  ...
+}</pre>
+
+<!-- END AUTHORED CONTENT -->
diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc
index 33a3b03..a99d582 100644
--- a/chrome/common/extensions/extension.cc
+++ b/chrome/common/extensions/extension.cc
@@ -117,6 +117,7 @@ const char* Extension::kBookmarkPermission = "bookmarks";
 const char* Extension::kExperimentalPermission = "experimental";
 const char* Extension::kGeolocationPermission = "geolocation";
 const char* Extension::kHistoryPermission = "history";
+const char* Extension::kIdlePermission = "idle";
 const char* Extension::kNotificationPermission = "notifications";
 const char* Extension::kTabPermission = "tabs";
 const char* Extension::kUnlimitedStoragePermission = "unlimited_storage";
@@ -126,6 +127,7 @@ const char* Extension::kPermissionNames[] = {
   Extension::kBookmarkPermission,
   Extension::kExperimentalPermission,
   Extension::kGeolocationPermission,
+  Extension::kIdlePermission,
   Extension::kHistoryPermission,
   Extension::kNotificationPermission,
   Extension::kTabPermission,
diff --git a/chrome/common/extensions/extension.h b/chrome/common/extensions/extension.h
index fe7ac77..9685c9f 100644
--- a/chrome/common/extensions/extension.h
+++ b/chrome/common/extensions/extension.h
@@ -99,6 +99,7 @@ class Extension {
   static const char* kExperimentalPermission;
   static const char* kGeolocationPermission;
   static const char* kHistoryPermission;
+  static const char* kIdlePermission;
   static const char* kNotificationPermission;
   static const char* kTabPermission;
   static const char* kUnlimitedStoragePermission;
diff --git a/chrome/test/data/extensions/api_test/idle/manifest.json b/chrome/test/data/extensions/api_test/idle/manifest.json
index 5284e20..41c71f9 100644
--- a/chrome/test/data/extensions/api_test/idle/manifest.json
+++ b/chrome/test/data/extensions/api_test/idle/manifest.json
@@ -3,5 +3,5 @@
   "version": "0.1",
   "description": "end-to-end browser test for chrome.idle API",
   "background_page": "test.html",
-  "permissions": ["experimental"]
+  "permissions": ["idle"]
 }
diff --git a/chrome/test/data/extensions/api_test/permissions/disabled/background.html b/chrome/test/data/extensions/api_test/permissions/disabled/background.html
index b5c52c5..6975df3 100644
--- a/chrome/test/data/extensions/api_test/permissions/disabled/background.html
+++ b/chrome/test/data/extensions/api_test/permissions/disabled/background.html
@@ -32,6 +32,16 @@ chrome.test.runTests([
     } catch (e) {
       chrome.test.succeed();
     }
+  },
+
+  function idle() {
+    try {
+      chrome.idle.queryState(60, function(state) {
+        chrome.test.fail();
+      });
+    } catch (e) {
+      chrome.test.succeed();
+    }
   }
 ]);
 </script>