diff options
| author | kalman@chromium.org <kalman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-29 16:47:12 +0000 |
|---|---|---|
| committer | kalman@chromium.org <kalman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-29 16:47:12 +0000 |
| commit | db64549243ff94833254385cbdd236ecf2d431c5 (patch) | |
| tree | 807d387434d9c28b23aa4893b93b4a43b23b2bd1 /chrome/common/extensions/api | |
| parent | 2cbb4c3b57fabdb76e0e237276f2de544648de58 (diff) | |
| download | chromium_src-db64549243ff94833254385cbdd236ecf2d431c5.zip chromium_src-db64549243ff94833254385cbdd236ecf2d431c5.tar.gz chromium_src-db64549243ff94833254385cbdd236ecf2d431c5.tar.bz2 | |
Revert 247564 "Merge 241969 "Add a BLESSED_WEB_PAGE extension JS..."
> Merge 241969 "Add a BLESSED_WEB_PAGE extension JS context type t..."
>
> > Add a BLESSED_WEB_PAGE extension JS context type to describe the context in
> > which hosted apps run. Currently they're running in BLESSED_EXTENSION which is
> > dangerous not to mention wrong. WEB_PAGE is also wrong because additional APIs
> > are available to hosted apps.
> >
> > The immediate need for this change is so that websites with hosted apps can
> > still use chrome.runtime.connect/sendMessage if they're connectable. As they're
> > currently classed as extension contexts the security checks are done as though
> > the messages originate from an extension. This CL doesn't quite fix the bug but
> > is half way there.
> >
> > BUG=326250
> > R=koz@chromium.org,jochen@chromium.org
> >
> > Review URL: https://codereview.chromium.org/112293003
>
> TBR=kalman@chromium.org
>
> Review URL: https://codereview.chromium.org/134623008
TBR=kalman@chromium.org
Review URL: https://codereview.chromium.org/149613002
git-svn-id: svn://svn.chromium.org/chrome/branches/1750/src@247701 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/extensions/api')
| -rw-r--r-- | chrome/common/extensions/api/_api_features.json | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/chrome/common/extensions/api/_api_features.json b/chrome/common/extensions/api/_api_features.json index eb87ca2..62db5f7 100644 --- a/chrome/common/extensions/api/_api_features.json +++ b/chrome/common/extensions/api/_api_features.json @@ -22,11 +22,7 @@ "channel": "stable", "extension_types": ["hosted_app", "extension", "legacy_packaged_app"], "contexts": [ - "blessed_extension", - "unblessed_extension", - "content_script", - "web_page", - "blessed_web_page" + "blessed_extension", "unblessed_extension", "content_script", "web_page" ], "matches": [ "http://*/*", "https://*/*", "chrome-extension://*/*", "file://*/*" @@ -241,7 +237,9 @@ "internal": true, "channel": "stable", "extension_types": ["platform_app", "extension"], - "contexts": "all", + "contexts": [ + "blessed_extension", "unblessed_extension", "content_script", "web_page" + ], "matches": ["<all_urls>"] }, "experimental.accessibility": { @@ -711,7 +709,7 @@ // Hosted apps can use the webstore API from within a blessed context. "channel": "stable", "extension_types": ["hosted_app"], - "contexts": ["blessed_web_page", "web_page"], + "contexts": ["blessed_extension", "web_page"], // Any webpage can use the webstore API. "matches": ["http://*/*", "https://*/*"] }, |