Enable Pointer Lock for packaged apps using ShellWindow.

BUG=148532


Review URL: https://chromiumcodereview.appspot.com/11413131

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

5 files changed, 19 insertions, 2 deletions

diff --git a/chrome/common/extensions/api/_permission_features.json b/chrome/common/extensions/api/_permission_features.json
index 4a17329..1d8c74f 100644
--- a/chrome/common/extensions/api/_permission_features.json
+++ b/chrome/common/extensions/api/_permission_features.json
@@ -235,6 +235,10 @@
     "channel": "stable",
     "extension_types": ["extension", "packaged_app"]
   },
+  "pointerLock": {
+    "channel": "dev",
+    "extension_types": ["platform_app"]
+  },
   "plugin": {
     "channel": "stable",
     "extension_types": ["extension", "packaged_app"]
diff --git a/chrome/common/extensions/docs/templates/articles/declare_permissions.html b/chrome/common/extensions/docs/templates/articles/declare_permissions.html
index 92c3ef9..a8ad27d 100644
--- a/chrome/common/extensions/docs/templates/articles/declare_permissions.html
+++ b/chrome/common/extensions/docs/templates/articles/declare_permissions.html
@@ -226,6 +226,16 @@ table.
        For more information see
        <a href="notifications.html">Desktop Notifications</a>.</td>
 </tr>
+{{?is_apps}}
+<tr>
+  <td> "pointerLock" </td>
+  <td> Required to use
+    <a href="http://www.w3.org/TR/pointerlock/">Pointer Lock</a> via calls to
+    <code>webkitRequestPointerLock</code></a> or Pepper's
+    <a href="https://developers.google.com/native-client/peppercpp/classpp_1_1_mouse_lock">
+    Mouse Lock API</a>. </td>
+</tr>
+{{/is_apps}}
 {{^is_apps}}
 <tr>
   <td> "privacy" </td>
diff --git a/chrome/common/extensions/permissions/api_permission.cc b/chrome/common/extensions/permissions/api_permission.cc
index dbccbd4..cee9432 100644
--- a/chrome/common/extensions/permissions/api_permission.cc
+++ b/chrome/common/extensions/permissions/api_permission.cc
@@ -329,6 +329,7 @@ void APIPermissionInfo::RegisterAllPermissions(
     { APIPermission::kSystemIndicator, "systemIndicator", kFlagNone,
       IDS_EXTENSION_PROMPT_WARNING_SYSTEM_INDICATOR,
       PermissionMessage::kSystemIndicator },
+    { APIPermission::kPointerLock, "pointerLock" },
   };
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(PermissionsToRegister); ++i) {
diff --git a/chrome/common/extensions/permissions/api_permission.h b/chrome/common/extensions/permissions/api_permission.h
index a022b27..c942c5b 100644
--- a/chrome/common/extensions/permissions/api_permission.h
+++ b/chrome/common/extensions/permissions/api_permission.h
@@ -84,6 +84,7 @@ class APIPermission {
     kMetricsPrivate,
     kNotification,
     kPageCapture,
+    kPointerLock,
     kPlugin,
     kPrivacy,
     kProxy,
diff --git a/chrome/common/extensions/permissions/permission_set_unittest.cc b/chrome/common/extensions/permissions/permission_set_unittest.cc
index cd536db..9834e14 100644
--- a/chrome/common/extensions/permissions/permission_set_unittest.cc
+++ b/chrome/common/extensions/permissions/permission_set_unittest.cc
@@ -653,19 +653,20 @@ TEST(PermissionsTest, PermissionMessages) {
   // a prompt.
   skip.insert(APIPermission::kActiveTab);
   skip.insert(APIPermission::kAlarms);
+  skip.insert(APIPermission::kAppCurrentWindowInternal);
   skip.insert(APIPermission::kAppNotifications);
   skip.insert(APIPermission::kAppRuntime);
   skip.insert(APIPermission::kAppWindow);
-  skip.insert(APIPermission::kAppCurrentWindowInternal);
   skip.insert(APIPermission::kBrowsingData);
   skip.insert(APIPermission::kContextMenus);
   skip.insert(APIPermission::kFontSettings);
   skip.insert(APIPermission::kIdle);
   skip.insert(APIPermission::kNotification);
+  skip.insert(APIPermission::kPointerLock);
   skip.insert(APIPermission::kPushMessaging);
-  skip.insert(APIPermission::kUnlimitedStorage);
   skip.insert(APIPermission::kStorage);
   skip.insert(APIPermission::kTts);
+  skip.insert(APIPermission::kUnlimitedStorage);
   skip.insert(APIPermission::kWebView);
 
   // TODO(erikkay) add a string for this permission.