diff options
| author | gbillock@chromium.org <gbillock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-16 20:41:20 +0000 |
|---|---|---|
| committer | gbillock@chromium.org <gbillock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-16 20:41:20 +0000 |
| commit | 7a137c9deed67a943c21f82d0a9c71112da5d603 (patch) | |
| tree | 776060f62eb90aebdbe304654d176772705f0922 /content/browser | |
| parent | 84a9361de5e11561f59becc0b38a707fff8da198 (diff) | |
| download | chromium_src-7a137c9deed67a943c21f82d0a9c71112da5d603.zip chromium_src-7a137c9deed67a943c21f82d0a9c71112da5d603.tar.gz chromium_src-7a137c9deed67a943c21f82d0a9c71112da5d603.tar.bz2 | |
Add API to construct new vector interchange MIME data type.
Add test for web intents host.
R=groby@chromium.org
BUG=153695
Review URL: https://chromiumcodereview.appspot.com/11026070
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162239 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser')
| -rw-r--r-- | content/browser/intents/intent_injector.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/content/browser/intents/intent_injector.cc b/content/browser/intents/intent_injector.cc index 6645760..28cd1e2 100644 --- a/content/browser/intents/intent_injector.cc +++ b/content/browser/intents/intent_injector.cc @@ -82,8 +82,11 @@ void IntentInjector::RenderViewCreated(RenderViewHost* render_view_host) { return; } - if (source_intent_->data_type == webkit_glue::WebIntentData::BLOB) { - // Grant read permission on the blob file to the delivered context. + // If we're passing a browser-originated blob, either directly or as part of a + // payload, grant read permission on the blob file to the delivered context. + if (source_intent_->data_type == webkit_glue::WebIntentData::BLOB || + (source_intent_->data_type == webkit_glue::WebIntentData::MIME_TYPE && + !source_intent_->blob_file.empty())) { const int child_id = render_view_host->GetProcess()->GetID(); ChildProcessSecurityPolicy* policy = ChildProcessSecurityPolicy::GetInstance(); |