diff --git a/chrome/common/extensions/docs/history.html b/chrome/common/extensions/docs/history.html
index 1e0dfdda3331e1dec2ef9196b2eace9d247e4cc9..48cd58a62517d84ca7681a3cc6b10d0446465162 100644
--- a/chrome/common/extensions/docs/history.html
+++ b/chrome/common/extensions/docs/history.html
@@ -266,9 +266,9 @@
<a href="#types">Types</a>
<ol>
<li>
- <a href="#type-VisitItem">VisitItem</a>
- </li><li>
<a href="#type-HistoryItem">HistoryItem</a>
+ </li><li>
+ <a href="#type-VisitItem">VisitItem</a>
</li>
</ol>
</li>
@@ -1871,8 +1871,8 @@ For an example of using this API, see the
<!-- iterates over all types -->
<div class="apiItem">
- <a name="type-VisitItem"></a>
- <h4>VisitItem</h4>
+ <a name="type-HistoryItem"></a>
+ <h4>HistoryItem</h4>
<div>
<dt>
@@ -1902,7 +1902,7 @@ For an example of using this API, see the
<dd class="todo" style="display: none; ">
Undocumented.
</dd>
- <dd>An object encapsulating one visit to a URL.</dd>
+ <dd>An object encapsulating one result of a history query.</dd>
<!-- OBJECT PROPERTIES -->
<dd>
@@ -1951,13 +1951,13 @@ For an example of using this API, see the
</div><div>
<div>
<dt>
- <var>visitId</var>
+ <var>url</var>
<em>
<!-- TYPE -->
<div style="display:inline">
(
- <span class="optional" style="display: none; ">optional</span>
+ <span class="optional">optional</span>
<span id="typeTemplate">
<span style="display: none; ">
<a> Type</a>
@@ -1977,7 +1977,7 @@ For an example of using this API, see the
<dd class="todo" style="display: none; ">
Undocumented.
</dd>
- <dd>The unique identifier for this visit.</dd>
+ <dd>The URL navigated to by a user.</dd>
<!-- OBJECT PROPERTIES -->
<dd style="display: none; ">
@@ -1992,7 +1992,7 @@ For an example of using this API, see the
</div><div>
<div>
<dt>
- <var>visitTime</var>
+ <var>title</var>
<em>
<!-- TYPE -->
@@ -2007,7 +2007,7 @@ For an example of using this API, see the
<span style="display: none; ">
array of <span><span></span></span>
</span>
- <span>number</span>
+ <span>string</span>
</span>
</span>
)
@@ -2018,7 +2018,7 @@ For an example of using this API, see the
<dd class="todo" style="display: none; ">
Undocumented.
</dd>
- <dd>When this visit occurred, represented in milliseconds since the epoch.</dd>
+ <dd>The title of the history page.</dd>
<!-- OBJECT PROPERTIES -->
<dd style="display: none; ">
@@ -2033,13 +2033,13 @@ For an example of using this API, see the
</div><div>
<div>
<dt>
- <var>referringVisitId</var>
+ <var>lastVisitTime</var>
<em>
<!-- TYPE -->
<div style="display:inline">
(
- <span class="optional" style="display: none; ">optional</span>
+ <span class="optional">optional</span>
<span id="typeTemplate">
<span style="display: none; ">
<a> Type</a>
@@ -2048,7 +2048,7 @@ For an example of using this API, see the
<span style="display: none; ">
array of <span><span></span></span>
</span>
- <span>string</span>
+ <span>number</span>
</span>
</span>
)
@@ -2059,7 +2059,7 @@ For an example of using this API, see the
<dd class="todo" style="display: none; ">
Undocumented.
</dd>
- <dd>The visit_id of the referrer.</dd>
+ <dd>When this page was last loaded, represented in milliseconds since the epoch.</dd>
<!-- OBJECT PROPERTIES -->
<dd style="display: none; ">
@@ -2074,13 +2074,13 @@ For an example of using this API, see the
</div><div>
<div>
<dt>
- <var>transition</var>
+ <var>visitCount</var>
<em>
<!-- TYPE -->
<div style="display:inline">
(
- <span class="optional" style="display: none; ">optional</span>
+ <span class="optional">optional</span>
<span id="typeTemplate">
<span style="display: none; ">
<a> Type</a>
@@ -2089,7 +2089,7 @@ For an example of using this API, see the
<span style="display: none; ">
array of <span><span></span></span>
</span>
- <span>string</span>
+ <span>integer</span>
</span>
</span>
)
@@ -2100,7 +2100,7 @@ For an example of using this API, see the
<dd class="todo" style="display: none; ">
Undocumented.
</dd>
- <dd>The <a href="#transition_types">transition type</a> for this visit from its referrer.</dd>
+ <dd>The number of times the user has navigated to this page.</dd>
<!-- OBJECT PROPERTIES -->
<dd style="display: none; ">
@@ -2112,24 +2112,16 @@ For an example of using this API, see the
</dl>
</dd>
</div>
- </div>
- </dl>
- </dd>
- </div>
-
- </div><div class="apiItem">
- <a name="type-HistoryItem"></a>
- <h4>HistoryItem</h4>
-
- <div>
+ </div><div>
+ <div>
<dt>
- <var style="display: none; ">paramName</var>
+ <var>typedCount</var>
<em>
<!-- TYPE -->
<div style="display:inline">
(
- <span class="optional" style="display: none; ">optional</span>
+ <span class="optional">optional</span>
<span id="typeTemplate">
<span style="display: none; ">
<a> Type</a>
@@ -2138,7 +2130,7 @@ For an example of using this API, see the
<span style="display: none; ">
array of <span><span></span></span>
</span>
- <span>object</span>
+ <span>integer</span>
</span>
</span>
)
@@ -2149,15 +2141,30 @@ For an example of using this API, see the
<dd class="todo" style="display: none; ">
Undocumented.
</dd>
- <dd>An object encapsulating one result of a history query.</dd>
+ <dd>The number of times the user has navigated to this page by typing in the address.</dd>
<!-- OBJECT PROPERTIES -->
- <dd>
+ <dd style="display: none; ">
<dl>
<div>
<div>
+ </div>
+ </div>
+ </dl>
+ </dd>
+ </div>
+ </div>
+ </dl>
+ </dd>
+ </div>
+
+ </div><div class="apiItem">
+ <a name="type-VisitItem"></a>
+ <h4>VisitItem</h4>
+
+ <div>
<dt>
- <var>id</var>
+ <var style="display: none; ">paramName</var>
<em>
<!-- TYPE -->
@@ -2172,7 +2179,7 @@ For an example of using this API, see the
<span style="display: none; ">
array of <span><span></span></span>
</span>
- <span>string</span>
+ <span>object</span>
</span>
</span>
)
@@ -2183,28 +2190,21 @@ For an example of using this API, see the
<dd class="todo" style="display: none; ">
Undocumented.
</dd>
- <dd>The unique identifier for the item.</dd>
+ <dd>An object encapsulating one visit to a URL.</dd>
<!-- OBJECT PROPERTIES -->
- <dd style="display: none; ">
+ <dd>
<dl>
<div>
<div>
- </div>
- </div>
- </dl>
- </dd>
- </div>
- </div><div>
- <div>
<dt>
- <var>url</var>
+ <var>id</var>
<em>
<!-- TYPE -->
<div style="display:inline">
(
- <span class="optional">optional</span>
+ <span class="optional" style="display: none; ">optional</span>
<span id="typeTemplate">
<span style="display: none; ">
<a> Type</a>
@@ -2224,7 +2224,7 @@ For an example of using this API, see the
<dd class="todo" style="display: none; ">
Undocumented.
</dd>
- <dd>The URL navigated to by a user.</dd>
+ <dd>The unique identifier for the item.</dd>
<!-- OBJECT PROPERTIES -->
<dd style="display: none; ">
@@ -2239,13 +2239,13 @@ For an example of using this API, see the
</div><div>
<div>
<dt>
- <var>title</var>
+ <var>visitId</var>
<em>
<!-- TYPE -->
<div style="display:inline">
(
- <span class="optional">optional</span>
+ <span class="optional" style="display: none; ">optional</span>
<span id="typeTemplate">
<span style="display: none; ">
<a> Type</a>
@@ -2265,7 +2265,7 @@ For an example of using this API, see the
<dd class="todo" style="display: none; ">
Undocumented.
</dd>
- <dd>The title of the history page.</dd>
+ <dd>The unique identifier for this visit.</dd>
<!-- OBJECT PROPERTIES -->
<dd style="display: none; ">
@@ -2280,7 +2280,7 @@ For an example of using this API, see the
</div><div>
<div>
<dt>
- <var>lastVisitTime</var>
+ <var>visitTime</var>
<em>
<!-- TYPE -->
@@ -2306,7 +2306,7 @@ For an example of using this API, see the
<dd class="todo" style="display: none; ">
Undocumented.
</dd>
- <dd>When this page was last loaded, represented in milliseconds since the epoch.</dd>
+ <dd>When this visit occurred, represented in milliseconds since the epoch.</dd>
<!-- OBJECT PROPERTIES -->
<dd style="display: none; ">
@@ -2321,13 +2321,13 @@ For an example of using this API, see the
</div><div>
<div>
<dt>
- <var>visitCount</var>
+ <var>referringVisitId</var>
<em>
<!-- TYPE -->
<div style="display:inline">
(
- <span class="optional">optional</span>
+ <span class="optional" style="display: none; ">optional</span>
<span id="typeTemplate">
<span style="display: none; ">
<a> Type</a>
@@ -2336,7 +2336,7 @@ For an example of using this API, see the
<span style="display: none; ">
array of <span><span></span></span>
</span>
- <span>integer</span>
+ <span>string</span>
</span>
</span>
)
@@ -2347,7 +2347,7 @@ For an example of using this API, see the
<dd class="todo" style="display: none; ">
Undocumented.
</dd>
- <dd>The number of times the user has navigated to this page.</dd>
+ <dd>The visit_id of the referrer.</dd>
<!-- OBJECT PROPERTIES -->
<dd style="display: none; ">
@@ -2362,13 +2362,13 @@ For an example of using this API, see the
</div><div>
<div>
<dt>
- <var>typedCount</var>
+ <var>transition</var>
<em>
<!-- TYPE -->
<div style="display:inline">
(
- <span class="optional">optional</span>
+ <span class="optional" style="display: none; ">optional</span>
<span id="typeTemplate">
<span style="display: none; ">
<a> Type</a>
@@ -2377,7 +2377,7 @@ For an example of using this API, see the
<span style="display: none; ">
array of <span><span></span></span>
</span>
- <span>integer</span>
+ <span>string</span>
</span>
</span>
)
@@ -2388,7 +2388,7 @@ For an example of using this API, see the
<dd class="todo" style="display: none; ">
Undocumented.
</dd>
- <dd>The number of times the user has navigated to this page by typing in the address.</dd>
+ <dd>The <a href="#transition_types">transition type</a> for this visit from its referrer.</dd>
<!-- OBJECT PROPERTIES -->
<dd style="display: none; ">