diff options
| author | cdn@chromium.org <cdn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-13 00:01:34 +0000 |
|---|---|---|
| committer | cdn@chromium.org <cdn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-13 00:01:34 +0000 |
| commit | f1341e1f2a19fb05463d1b83107ade8aa46d194a (patch) | |
| tree | 6810767dc5a9ab1c653d02b29203e3269369eba4 /chrome/browser/extensions/extension_protocols.cc | |
| parent | ee4d3e80cfae83eeffe4e3f0c0d35ee5840ad575 (diff) | |
| download | chromium_src-f1341e1f2a19fb05463d1b83107ade8aa46d194a.zip chromium_src-f1341e1f2a19fb05463d1b83107ade8aa46d194a.tar.gz chromium_src-f1341e1f2a19fb05463d1b83107ade8aa46d194a.tar.bz2 | |
Fixes a bug in revision 55103 that prevents extensions from loading their own resources in some rare cases when the origin is "null".
BUG=51702
TEST=None
Review URL: http://codereview.chromium.org/3144003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55967 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_protocols.cc')
| -rw-r--r-- | chrome/browser/extensions/extension_protocols.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/browser/extensions/extension_protocols.cc b/chrome/browser/extensions/extension_protocols.cc index f1b09eb..ac2ea44 100644 --- a/chrome/browser/extensions/extension_protocols.cc +++ b/chrome/browser/extensions/extension_protocols.cc @@ -89,6 +89,11 @@ bool AllowExtensionResourceLoad(URLRequest* request, if (origin_url.SchemeIs(chrome::kExtensionScheme)) return true; + // Allow extenion's options pages to access resources media resources. + // This will have an origin of "null". + if (LowerCaseEqualsASCII(info->frame_origin(), "null")) + return true; + // Extension resources should only be loadable from web pages which the // extension has host permissions to (and therefore could be running script // in, which might need access to the extension resources). |