diff options
| author | erikkay@chromium.org <erikkay@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-10 00:05:03 +0000 |
|---|---|---|
| committer | erikkay@chromium.org <erikkay@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-10 00:05:03 +0000 |
| commit | 45def830e381d63a2f3bf809342bf624a20d4f2a (patch) | |
| tree | 4cd194b506de41f7bedd55d39bf9197e266e2ac2 /chrome/browser/extensions/sandboxed_extension_unpacker.cc | |
| parent | e6fae168d6fd6556f4455265fb18323db9ca56de (diff) | |
| download | chromium_src-45def830e381d63a2f3bf809342bf624a20d4f2a.zip chromium_src-45def830e381d63a2f3bf809342bf624a20d4f2a.tar.gz chromium_src-45def830e381d63a2f3bf809342bf624a20d4f2a.tar.bz2 | |
loosen origin requirements for apps for now
BUG=40848
TEST=none
Review URL: http://codereview.chromium.org/1530027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44162 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/sandboxed_extension_unpacker.cc')
| -rw-r--r-- | chrome/browser/extensions/sandboxed_extension_unpacker.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/extensions/sandboxed_extension_unpacker.cc b/chrome/browser/extensions/sandboxed_extension_unpacker.cc index 427b864..a976400 100644 --- a/chrome/browser/extensions/sandboxed_extension_unpacker.cc +++ b/chrome/browser/extensions/sandboxed_extension_unpacker.cc @@ -261,12 +261,12 @@ DictionaryValue* SandboxedExtensionUnpacker::RewriteManifestFile( &web_content_enabled) && web_content_enabled && web_origin_.is_valid()) { - if (final_manifest->HasKey(extension_manifest_keys::kWebOrigin)) { - ReportFailure("Unexpected 'web_content.origin' key in manifest."); - return NULL; + // TODO(erikkay): Finalize origin policy. This is intentionally loose + // until we can test from the gallery. http://crbug.com/40848. + if (!final_manifest->Get(extension_manifest_keys::kWebOrigin, NULL)) { + final_manifest->SetString(extension_manifest_keys::kWebOrigin, + web_origin_.spec()); } - final_manifest->SetString(extension_manifest_keys::kWebOrigin, - web_origin_.spec()); } std::string manifest_json; |