diff options
| author | michaeln@google.com <michaeln@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-16 21:36:44 +0000 |
|---|---|---|
| committer | michaeln@google.com <michaeln@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-16 21:36:44 +0000 |
| commit | c84a78578ea53490282bfb128fd844b120f926b5 (patch) | |
| tree | 5bd1d8218ecf5d7863b33b3873a100386f61a96e /chrome/browser | |
| parent | ca11e335df5305cdb46cfa8f27091cf9d70fb5b6 (diff) | |
| download | chromium_src-c84a78578ea53490282bfb128fd844b120f926b5.zip chromium_src-c84a78578ea53490282bfb128fd844b120f926b5.tar.gz chromium_src-c84a78578ea53490282bfb128fd844b120f926b5.tar.bz2 | |
Gears File Drag Drop
r24899 now keys the child security policy database based on
renderer id, rather than renderer process id. Update gears
drag drop to use the renderer id for the file policy access
checks.
This is a clone for submission of of noel's original CL
http://codereview.chromium.org/195079
BUG=7995
Review URL: http://codereview.chromium.org/196145
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26397 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/plugin_process_host.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/plugin_process_host.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/plugin_process_host.cc b/chrome/browser/plugin_process_host.cc index 0befa1c..1ae4e25 100644 --- a/chrome/browser/plugin_process_host.cc +++ b/chrome/browser/plugin_process_host.cc @@ -537,7 +537,7 @@ void PluginProcessHost::OnGetCookies(uint32 request_context, } } -void PluginProcessHost::OnAccessFiles(int process_id, +void PluginProcessHost::OnAccessFiles(int renderer_id, const std::vector<std::string>& files, bool* allowed) { ChildProcessSecurityPolicy* policy = @@ -545,7 +545,7 @@ void PluginProcessHost::OnAccessFiles(int process_id, for (size_t i = 0; i < files.size(); ++i) { const FilePath path = FilePath::FromWStringHack(UTF8ToWide(files[i])); - if (!policy->CanUploadFile(process_id, path)) { + if (!policy->CanUploadFile(renderer_id, path)) { LOG(INFO) << "Denied unauthorized request for file " << files[i]; *allowed = false; return; diff --git a/chrome/browser/plugin_process_host.h b/chrome/browser/plugin_process_host.h index 66b5098..a223503 100644 --- a/chrome/browser/plugin_process_host.h +++ b/chrome/browser/plugin_process_host.h @@ -97,7 +97,7 @@ class PluginProcessHost : public ChildProcessHost, void OnGetPluginFinderUrl(std::string* plugin_finder_url); void OnGetCookies(uint32 request_context, const GURL& url, std::string* cookies); - void OnAccessFiles(int process_id, const std::vector<std::string>& files, + void OnAccessFiles(int renderer_id, const std::vector<std::string>& files, bool* allowed); void OnResolveProxy(const GURL& url, IPC::Message* reply_msg); void OnPluginMessage(const std::vector<uint8>& data); |