summaryrefslogtreecommitdiffstats
path: root/extensions
diff options
context:
space:
mode:
authoryoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-23 02:30:30 +0000
committeryoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-23 02:30:30 +0000
commitf3afef2ef2f49c41686eb99eee78a56f5a29434f (patch)
tree277768c322d24493ffd8f24c1c106512ef5a44d3 /extensions
parentdd459ae77b91899aead8675fe7a7ffbc4bdeca3e (diff)
downloadchromium_src-f3afef2ef2f49c41686eb99eee78a56f5a29434f.zip
chromium_src-f3afef2ef2f49c41686eb99eee78a56f5a29434f.tar.gz
chromium_src-f3afef2ef2f49c41686eb99eee78a56f5a29434f.tar.bz2
Use _api_features checks for app.runtime and app.window instead of permissions.
Eliminate the corresponding dummy permissions. BUG=310707 TBR=achuith@chromium.org Review URL: https://codereview.chromium.org/131103012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@246494 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'extensions')
-rw-r--r--extensions/common/permissions/api_permission.h3
-rw-r--r--extensions/common/permissions/permissions_data.cc12
2 files changed, 0 insertions, 15 deletions
diff --git a/extensions/common/permissions/api_permission.h b/extensions/common/permissions/api_permission.h
index 4e33d3b..9fab5e4 100644
--- a/extensions/common/permissions/api_permission.h
+++ b/extensions/common/permissions/api_permission.h
@@ -40,9 +40,6 @@ class APIPermission {
kAdView,
kAlarms,
kAlwaysOnTopWindows,
- kAppCurrentWindowInternal,
- kAppRuntime,
- kAppWindow,
kAudio,
kAudioCapture,
kAutoTestPrivate,
diff --git a/extensions/common/permissions/permissions_data.cc b/extensions/common/permissions/permissions_data.cc
index 786d34d..59428b6 100644
--- a/extensions/common/permissions/permissions_data.cc
+++ b/extensions/common/permissions/permissions_data.cc
@@ -572,18 +572,6 @@ bool PermissionsData::ParsePermissions(Extension* extension,
return false;
}
- // TODO(jeremya/kalman) do this via the features system by exposing the
- // app.window API to platform apps, with no dependency on any permissions.
- // See http://crbug.com/120069.
- if (extension->is_platform_app()) {
- initial_required_permissions_->api_permissions.insert(
- APIPermission::kAppCurrentWindowInternal);
- initial_required_permissions_->api_permissions.insert(
- APIPermission::kAppRuntime);
- initial_required_permissions_->api_permissions.insert(
- APIPermission::kAppWindow);
- }
-
initial_optional_permissions_.reset(new InitialPermissions);
if (!ParseHelper(extension,
keys::kOptionalPermissions,