Disallow display of multiple experimental.extension.popup(...) windows

This is a duplicate of http://codereview.chromium.org/2027006 which was accidentally created in a read-only client.

BUG=None
TEST=ExtensionApiTest.Popup

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

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

2 files changed, 62 insertions, 62 deletions

diff --git a/chrome/common/extensions/docs/extension.html b/chrome/common/extensions/docs/extension.html
index 113b81a..3c7f0cb 100644
--- a/chrome/common/extensions/docs/extension.html
+++ b/chrome/common/extensions/docs/extension.html
@@ -1158,7 +1158,7 @@ For details, see
           <dd class="todo" style="display: none; ">
             Undocumented.
           </dd>
-          <dd>The type of view to get. If omitted, returns all views (including background pages and tabs). Valid values: 'tab', 'infobar', 'notification'.</dd>
+          <dd>The type of view to get. If omitted, returns all views (including background pages and tabs). Valid values: 'tab', 'infobar', 'notification', 'popup'.</dd>
 
           <!-- OBJECT PROPERTIES -->
           <dd style="display: none; ">
diff --git a/chrome/common/extensions/docs/history.html b/chrome/common/extensions/docs/history.html
index 7079c0c..a6bf9b1 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>
@@ -1874,8 +1874,8 @@ For other examples and for help in viewing the source code, see
 
             <!-- 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>
@@ -1905,7 +1905,7 @@ For other examples and for help in viewing the source code, see
           <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>
@@ -1954,13 +1954,13 @@ For other examples and for help in viewing the source code, see
               </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>
@@ -1980,7 +1980,7 @@ For other examples and for help in viewing the source code, see
           <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; ">
@@ -1995,7 +1995,7 @@ For other examples and for help in viewing the source code, see
               </div><div>
                 <div>
           <dt>
-            <var>visitTime</var>
+            <var>title</var>
               <em>
 
                 <!-- TYPE -->
@@ -2010,7 +2010,7 @@ For other examples and for help in viewing the source code, see
                         <span style="display: none; ">
                           array of <span><span></span></span>
                         </span>
-                        <span>number</span>
+                        <span>string</span>
                       </span>
                     </span>
                   )
@@ -2021,7 +2021,7 @@ For other examples and for help in viewing the source code, see
           <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; ">
@@ -2036,13 +2036,13 @@ For other examples and for help in viewing the source code, see
               </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>
@@ -2051,7 +2051,7 @@ For other examples and for help in viewing the source code, see
                         <span style="display: none; ">
                           array of <span><span></span></span>
                         </span>
-                        <span>string</span>
+                        <span>number</span>
                       </span>
                     </span>
                   )
@@ -2062,7 +2062,7 @@ For other examples and for help in viewing the source code, see
           <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; ">
@@ -2077,13 +2077,13 @@ For other examples and for help in viewing the source code, see
               </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>
@@ -2092,7 +2092,7 @@ For other examples and for help in viewing the source code, see
                         <span style="display: none; ">
                           array of <span><span></span></span>
                         </span>
-                        <span>string</span>
+                        <span>integer</span>
                       </span>
                     </span>
                   )
@@ -2103,7 +2103,7 @@ For other examples and for help in viewing the source code, see
           <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; ">
@@ -2115,24 +2115,16 @@ For other examples and for help in viewing the source code, see
             </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>
@@ -2141,7 +2133,7 @@ For other examples and for help in viewing the source code, see
                         <span style="display: none; ">
                           array of <span><span></span></span>
                         </span>
-                        <span>object</span>
+                        <span>integer</span>
                       </span>
                     </span>
                   )
@@ -2152,15 +2144,30 @@ For other examples and for help in viewing the source code, see
           <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 -->
@@ -2175,7 +2182,7 @@ For other examples and for help in viewing the source code, see
                         <span style="display: none; ">
                           array of <span><span></span></span>
                         </span>
-                        <span>string</span>
+                        <span>object</span>
                       </span>
                     </span>
                   )
@@ -2186,28 +2193,21 @@ For other examples and for help in viewing the source code, see
           <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>
@@ -2227,7 +2227,7 @@ For other examples and for help in viewing the source code, see
           <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; ">
@@ -2242,13 +2242,13 @@ For other examples and for help in viewing the source code, see
               </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>
@@ -2268,7 +2268,7 @@ For other examples and for help in viewing the source code, see
           <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; ">
@@ -2283,7 +2283,7 @@ For other examples and for help in viewing the source code, see
               </div><div>
                 <div>
           <dt>
-            <var>lastVisitTime</var>
+            <var>visitTime</var>
               <em>
 
                 <!-- TYPE -->
@@ -2309,7 +2309,7 @@ For other examples and for help in viewing the source code, see
           <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; ">
@@ -2324,13 +2324,13 @@ For other examples and for help in viewing the source code, see
               </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>
@@ -2339,7 +2339,7 @@ For other examples and for help in viewing the source code, see
                         <span style="display: none; ">
                           array of <span><span></span></span>
                         </span>
-                        <span>integer</span>
+                        <span>string</span>
                       </span>
                     </span>
                   )
@@ -2350,7 +2350,7 @@ For other examples and for help in viewing the source code, see
           <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; ">
@@ -2365,13 +2365,13 @@ For other examples and for help in viewing the source code, see
               </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>
@@ -2380,7 +2380,7 @@ For other examples and for help in viewing the source code, see
                         <span style="display: none; ">
                           array of <span><span></span></span>
                         </span>
-                        <span>integer</span>
+                        <span>string</span>
                       </span>
                     </span>
                   )
@@ -2391,7 +2391,7 @@ For other examples and for help in viewing the source code, see
           <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; ">