summaryrefslogtreecommitdiffstats
path: root/chrome/renderer/extensions/chrome_v8_context.cc
diff options
context:
space:
mode:
authorkalman@chromium.org <kalman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-29 16:51:28 +0000
committerkalman@chromium.org <kalman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-29 16:51:28 +0000
commit7415e329ce844348328e54a99d36f31dc72d890c (patch)
tree40ea05abf21ef027f66c97f38c71925a3fbeacfb /chrome/renderer/extensions/chrome_v8_context.cc
parentdb64549243ff94833254385cbdd236ecf2d431c5 (diff)
downloadchromium_src-7415e329ce844348328e54a99d36f31dc72d890c.zip
chromium_src-7415e329ce844348328e54a99d36f31dc72d890c.tar.gz
chromium_src-7415e329ce844348328e54a99d36f31dc72d890c.tar.bz2
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/149523003 git-svn-id: svn://svn.chromium.org/chrome/branches/1750/src@247702 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/extensions/chrome_v8_context.cc')
-rw-r--r--chrome/renderer/extensions/chrome_v8_context.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/chrome/renderer/extensions/chrome_v8_context.cc b/chrome/renderer/extensions/chrome_v8_context.cc
index bdeebd1..e6e8d18 100644
--- a/chrome/renderer/extensions/chrome_v8_context.cc
+++ b/chrome/renderer/extensions/chrome_v8_context.cc
@@ -123,6 +123,7 @@ std::string ChromeV8Context::GetContextTypeDescription() {
case Feature::UNBLESSED_EXTENSION_CONTEXT: return "UNBLESSED_EXTENSION";
case Feature::CONTENT_SCRIPT_CONTEXT: return "CONTENT_SCRIPT";
case Feature::WEB_PAGE_CONTEXT: return "WEB_PAGE";
+ case Feature::BLESSED_WEB_PAGE_CONTEXT: return "BLESSED_WEB_PAGE";
}
NOTREACHED();
return std::string();