diff options
| author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-31 08:09:45 +0000 |
|---|---|---|
| committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-31 08:09:45 +0000 |
| commit | 0a1a4543882c0cf8b73a44d4d79f36c4e6d77fe9 (patch) | |
| tree | fcf3bff8df2138387cb0ad397460216fc05a66dc /chrome/browser/renderer_host/database_permission_request.cc | |
| parent | 28dd598b6433c08e58e261538af94b8aa5edff60 (diff) | |
| download | chromium_src-0a1a4543882c0cf8b73a44d4d79f36c4e6d77fe9.zip chromium_src-0a1a4543882c0cf8b73a44d4d79f36c4e6d77fe9.tar.gz chromium_src-0a1a4543882c0cf8b73a44d4d79f36c4e6d77fe9.tar.bz2 | |
Reland 43183. Block database access on allowDatabase instead of databaseOpenFile. BUG=36435 TEST=Set cookie settings to ASK and open a page with web databases. Review URL: http://codereview.chromium.org/1338001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43185 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/renderer_host/database_permission_request.cc')
| -rw-r--r-- | chrome/browser/renderer_host/database_permission_request.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/chrome/browser/renderer_host/database_permission_request.cc b/chrome/browser/renderer_host/database_permission_request.cc index 5efb567..fb417e7 100644 --- a/chrome/browser/renderer_host/database_permission_request.cc +++ b/chrome/browser/renderer_host/database_permission_request.cc @@ -13,11 +13,15 @@ DatabasePermissionRequest::DatabasePermissionRequest( const GURL& url, const string16& database_name, + const string16& display_name, + unsigned long estimated_size, Task* on_allow, Task* on_block, HostContentSettingsMap* settings_map) : url_(url), database_name_(database_name), + display_name_(display_name), + estimated_size_(estimated_size), on_allow_(on_allow), on_block_(on_block), host_content_settings_map_(settings_map) { @@ -55,7 +59,8 @@ void DatabasePermissionRequest::RequestPermission() { // Will call either AllowSiteData or BlockSiteData which will NULL out our // self reference. RunDatabasePrompt(browser->GetSelectedTabContents(), - host_content_settings_map_, url_, database_name_, this); + host_content_settings_map_, url_, database_name_, + display_name_, estimated_size_, this); } void DatabasePermissionRequest::AllowSiteData(bool session_expire) { |