Add type 'panel' to chrome.windows.create.

BUG=None
TEST=New extension API test.

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

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

4 files changed, 12 insertions, 8 deletions

diff --git a/chrome/common/extensions/api/extension_api.json b/chrome/common/extensions/api/extension_api.json
index eabdda5..de69542 100644
--- a/chrome/common/extensions/api/extension_api.json
+++ b/chrome/common/extensions/api/extension_api.json
@@ -718,8 +718,8 @@
           "incognito": {"type": "boolean", "description": "Whether the window is incognito."},
           "type": {
             "type": "string",
-            "description": "The type of browser window this is.",
-            "enum": ["normal", "popup", "app"]
+            "description": "The type of browser window this is. The 'panel' type requires the 'experimental' permission.",
+            "enum": ["normal", "popup", "panel", "app"]
           }
         }
       }
@@ -834,8 +834,8 @@
               "type": {
                 "type": "string",
                 "optional": true,
-                "description": "Specifies what type of browser window to create.",
-                "enum": ["normal", "popup"]
+                "description": "Specifies what type of browser window to create. The 'panel' type requires the 'experimental' permission.",
+                "enum": ["normal", "popup", "panel"]
               }
             },
             "optional": true
diff --git a/chrome/common/extensions/docs/windows.html b/chrome/common/extensions/docs/windows.html
index c4b54fc..ba96d58 100644
--- a/chrome/common/extensions/docs/windows.html
+++ b/chrome/common/extensions/docs/windows.html
@@ -1139,7 +1139,7 @@ For other examples and for help in viewing the source code, see
                           array of <span><span></span></span>
                         </span>
                         <span>string</span>
-                        <span>["normal", "popup"]</span>
+                        <span>["normal", "popup", "panel"]</span>
                       </span>
                     </span>
                   )
@@ -1150,7 +1150,7 @@ For other examples and for help in viewing the source code, see
           <dd class="todo" style="display: none; ">
             Undocumented.
           </dd>
-          <dd>Specifies what type of browser window to create.</dd>
+          <dd>Specifies what type of browser window to create. The 'panel' type requires the 'experimental' permission.</dd>
           <dd style="display: none; ">
             This parameter was added in version
             <b><span></span></b>.
@@ -4190,7 +4190,7 @@ For other examples and for help in viewing the source code, see
                           array of <span><span></span></span>
                         </span>
                         <span>string</span>
-                        <span>["normal", "popup", "app"]</span>
+                        <span>["normal", "popup", "panel", "app"]</span>
                       </span>
                     </span>
                   )
@@ -4201,7 +4201,7 @@ For other examples and for help in viewing the source code, see
           <dd class="todo" style="display: none; ">
             Undocumented.
           </dd>
-          <dd>The type of browser window this is.</dd>
+          <dd>The type of browser window this is. The 'panel' type requires the 'experimental' permission.</dd>
           <dd style="display: none; ">
             This parameter was added in version
             <b><span></span></b>.
diff --git a/chrome/common/extensions/extension_constants.cc b/chrome/common/extensions/extension_constants.cc
index f526f1c..97243e5 100644
--- a/chrome/common/extensions/extension_constants.cc
+++ b/chrome/common/extensions/extension_constants.cc
@@ -124,6 +124,9 @@ const char* kExpectString = "Expect string value.";
 const char* kExperimentalFlagRequired =
     "Loading extensions with 'experimental' permission requires"
     " --enable-experimental-extension-apis command line flag.";
+const char *kExperimentalFeature =
+    "This feature requires 'experimental' permissions and"
+    " --enable-experimental-extension-apis command line flag.";
 const char* kHostedAppsCannotIncludeExtensionFeatures =
     "Hosted apps cannot use extension features.";
 const char* kInvalidAllFrames =
diff --git a/chrome/common/extensions/extension_constants.h b/chrome/common/extensions/extension_constants.h
index 8f1f270..daa2156 100644
--- a/chrome/common/extensions/extension_constants.h
+++ b/chrome/common/extensions/extension_constants.h
@@ -113,6 +113,7 @@ namespace extension_manifest_errors {
   extern const char* kDevToolsExperimental;
   extern const char* kDisabledByPolicy;
   extern const char* kExperimentalFlagRequired;
+  extern const char* kExperimentalFeature;
   extern const char* kExpectString;
   extern const char* kHostedAppsCannotIncludeExtensionFeatures;
   extern const char* kInvalidAllFrames;