Move onImportBegan/Ended to the regular bookmarks api

It used to live in the experimental.bookmarkManager namespace.

BUG=35320
TEST=none

Review URL: http://codereview.chromium.org/1353004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42825 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 206 insertions, 30 deletions

diff --git a/chrome/common/extensions/api/extension_api.json b/chrome/common/extensions/api/extension_api.json
index ea80713..1adf289 100755
--- a/chrome/common/extensions/api/extension_api.json
+++ b/chrome/common/extensions/api/extension_api.json
@@ -1625,6 +1625,24 @@
           {"type": "string", "name": "id"},
           {"type": "function", "name": "callback", "optional": true, "parameters": []}
         ]
+      },
+      {
+        "name": "import",
+        "type": "function",
+        "description": "Imports bookmarks from a chrome html bookmark file",
+        "nodoc": "true",
+        "parameters": [
+          {"type": "function", "name": "callback", "optional": true, "parameters": []}
+        ]
+      },
+      {
+        "name": "export",
+        "type": "function",
+        "description": "Exports bookmarks to a chrome html bookmark file",
+        "nodoc": "true",
+        "parameters": [
+          {"type": "function", "name": "callback", "optional": true, "parameters": []}
+        ]
       }
     ],
     "events": [
@@ -1704,6 +1722,18 @@
             }
           }
         ]
+      },
+      {
+        "name": "onImportBegan",
+        "type": "function",
+        "description": "Fired when a bookmark import session is begun.  Expensive observers should ignore handleCreated updates until onImportEnded is fired.  Observers should still handle other notifications immediately.",
+        "parameters": []
+      },
+      {
+        "name": "onImportEnded",
+        "type": "function",
+        "description": "Fired when a bookmark import session is ended.",
+        "parameters": []
       }
     ]
   },
@@ -2166,24 +2196,6 @@
         ]
       },
       {
-        "name": "import",
-        "type": "function",
-        "description": "Imports bookmarks from a chrome html bookmark file",
-        "nodoc": "true",
-        "parameters": [
-          {"type": "function", "name": "callback", "optional": true, "parameters": []}
-        ]
-      },
-      {
-        "name": "export",
-        "type": "function",
-        "description": "Exports bookmarks to a chrome html bookmark file",
-        "nodoc": "true",
-        "parameters": [
-          {"type": "function", "name": "callback", "optional": true, "parameters": []}
-        ]
-      },
-      {
         "name": "sortChildren",
         "type": "function",
         "description": "Sorts the children of a given folder",
@@ -2249,18 +2261,6 @@
     ],
     "events": [
       {
-        "name": "onImportBegan",
-        "type": "function",
-        "description": "Fired when a bookmark import session is begun.  Expensive observers should ignore handleCreated updates until onImportEnded is fired.  Observers should still handle other notifications immediately.",
-        "parameters": []
-      },
-      {
-        "name": "onImportEnded",
-        "type": "function",
-        "description": "Fired when a bookmark import session is ended.",
-        "parameters": []
-      },
-      {
         "name": "onDragEnter",
         "type": "function",
         "description": "Fired when dragging bookmarks over the document",
diff --git a/chrome/common/extensions/docs/bookmarks.html b/chrome/common/extensions/docs/bookmarks.html
index 9d257c8..6401670 100644
--- a/chrome/common/extensions/docs/bookmarks.html
+++ b/chrome/common/extensions/docs/bookmarks.html
@@ -238,6 +238,8 @@
                     <ol>
                       <li>
                         <a href="#method-create">create</a>
+                      </li><li style="display: none; ">
+                        <a href="#method-anchor">methodName</a>
                       </li><li>
                         <a href="#method-get">get</a>
                       </li><li>
@@ -246,6 +248,8 @@
                         <a href="#method-getRecent">getRecent</a>
                       </li><li>
                         <a href="#method-getTree">getTree</a>
+                      </li><li style="display: none; ">
+                        <a href="#method-anchor">methodName</a>
                       </li><li>
                         <a href="#method-move">move</a>
                       </li><li>
@@ -269,6 +273,10 @@
                       </li><li>
                         <a href="#event-onCreated">onCreated</a>
                       </li><li>
+                        <a href="#event-onImportBegan">onImportBegan</a>
+                      </li><li>
+                        <a href="#event-onImportEnded">onImportEnded</a>
+                      </li><li>
                         <a href="#event-onMoved">onMoved</a>
                       </li><li>
                         <a href="#event-onRemoved">onRemoved</a>
@@ -757,6 +765,65 @@ For other examples and for help in viewing the source code, see
 
               </div> <!-- /description -->
 
+            </div><div class="apiItem" style="display: none; ">
+              <a></a> <!-- method-anchor -->
+              <h4>method name</h4>
+
+              <div class="summary"><span>void</span>
+                  <!-- Note: intentionally longer 80 columns -->
+                  <span>chrome.module.methodName</span>(<span><span>, </span><span></span>
+                      <var><span></span></var></span>)</div>
+
+              <div class="description">
+                <p class="todo">Undocumented.</p>
+                <p>
+                  A description from the json schema def of the function goes here.
+                </p>
+
+                <!-- PARAMETERS -->
+                <h4>Parameters</h4>
+                <dl>
+                  <div>
+                    <div>
+                    </div>
+                  </div>
+                </dl>
+
+                <!-- RETURNS -->
+                <h4>Returns</h4>
+                <dl>
+                  <div>
+                    <div>
+                    </div>
+                  </div>
+                </dl>
+
+                <!-- CALLBACK -->
+                <div>
+                  <div>
+                  <h4>Callback function</h4>
+                  <p>
+                    The callback <em>parameter</em> should specify a function
+                    that looks like this:
+                  </p>
+                  <p>
+                    If you specify the <em>callback</em> parameter, it should
+                    specify a function that looks like this:
+                  </p>
+
+                  <!-- Note: intentionally longer 80 columns -->
+                  <pre>function(<span>Type param1, Type param2</span>) <span class="subdued">{...}</span>);</pre>
+                  <dl>
+                    <div>
+                      <div>
+                      </div>
+                    </div>
+                  </dl>
+                  </div>
+                </div>
+
+              </div> <!-- /description -->
+
             </div><div class="apiItem">
               <a name="method-get"></a> <!-- method-anchor -->
               <h4>get</h4>
@@ -1473,6 +1540,65 @@ For other examples and for help in viewing the source code, see
 
               </div> <!-- /description -->
 
+            </div><div class="apiItem" style="display: none; ">
+              <a></a> <!-- method-anchor -->
+              <h4>method name</h4>
+
+              <div class="summary"><span>void</span>
+                  <!-- Note: intentionally longer 80 columns -->
+                  <span>chrome.module.methodName</span>(<span><span>, </span><span></span>
+                      <var><span></span></var></span>)</div>
+
+              <div class="description">
+                <p class="todo">Undocumented.</p>
+                <p>
+                  A description from the json schema def of the function goes here.
+                </p>
+
+                <!-- PARAMETERS -->
+                <h4>Parameters</h4>
+                <dl>
+                  <div>
+                    <div>
+                    </div>
+                  </div>
+                </dl>
+
+                <!-- RETURNS -->
+                <h4>Returns</h4>
+                <dl>
+                  <div>
+                    <div>
+                    </div>
+                  </div>
+                </dl>
+
+                <!-- CALLBACK -->
+                <div>
+                  <div>
+                  <h4>Callback function</h4>
+                  <p>
+                    The callback <em>parameter</em> should specify a function
+                    that looks like this:
+                  </p>
+                  <p>
+                    If you specify the <em>callback</em> parameter, it should
+                    specify a function that looks like this:
+                  </p>
+
+                  <!-- Note: intentionally longer 80 columns -->
+                  <pre>function(<span>Type param1, Type param2</span>) <span class="subdued">{...}</span>);</pre>
+                  <dl>
+                    <div>
+                      <div>
+                      </div>
+                    </div>
+                  </dl>
+                  </div>
+                </div>
+
+              </div> <!-- /description -->
+
             </div><div class="apiItem">
               <a name="method-move"></a> <!-- method-anchor -->
               <h4>move</h4>
@@ -3027,6 +3153,54 @@ For other examples and for help in viewing the source code, see
               </div> <!-- /decription -->
 
             </div><div class="apiItem">
+              <a name="event-onImportBegan"></a>
+              <h4>onImportBegan</h4>
+
+              <div class="summary">
+                <!-- Note: intentionally longer 80 columns -->
+                <span class="subdued">chrome.bookmarks.</span><span>onImportBegan</span><span class="subdued">.addListener</span>(function(<span></span>) <span class="subdued">{...}</span>);
+              </div>
+
+              <div class="description">
+                <p class="todo" style="display: none; ">Undocumented.</p>
+                <p>Fired when a bookmark import session is begun.  Expensive observers should ignore handleCreated updates until onImportEnded is fired.  Observers should still handle other notifications immediately.</p>
+
+                <!-- PARAMETERS -->
+                <h4>Parameters</h4>
+                <dl>
+                  <div style="display: none; ">
+                    <div>
+                    </div>
+                  </div>
+                </dl>
+
+              </div> <!-- /decription -->
+
+            </div><div class="apiItem">
+              <a name="event-onImportEnded"></a>
+              <h4>onImportEnded</h4>
+
+              <div class="summary">
+                <!-- Note: intentionally longer 80 columns -->
+                <span class="subdued">chrome.bookmarks.</span><span>onImportEnded</span><span class="subdued">.addListener</span>(function(<span></span>) <span class="subdued">{...}</span>);
+              </div>
+
+              <div class="description">
+                <p class="todo" style="display: none; ">Undocumented.</p>
+                <p>Fired when a bookmark import session is ended.</p>
+
+                <!-- PARAMETERS -->
+                <h4>Parameters</h4>
+                <dl>
+                  <div style="display: none; ">
+                    <div>
+                    </div>
+                  </div>
+                </dl>
+
+              </div> <!-- /decription -->
+
+            </div><div class="apiItem">
               <a name="event-onMoved"></a>
               <h4>onMoved</h4>
 
diff --git a/chrome/common/extensions/docs/override.html b/chrome/common/extensions/docs/override.html
index 71c1b72..1aba705 100644
--- a/chrome/common/extensions/docs/override.html
+++ b/chrome/common/extensions/docs/override.html
@@ -171,6 +171,8 @@
           <li><h2><a href="tutorials.html">Tutorials</a></h2>
             <ul>
               <li><a href="tut_debugging.html">Debugging</a></li>
+              <li><a href="tut_analytics.html">Google Analytics</a></li>
+              <li><a href="tut_oauth.html">OAuth</a></li>
             </ul>
           </li>
           <li><h2>Reference</h2>