summaryrefslogtreecommitdiffstats
path: root/chrome/browser/renderer_host/database_permission_request.cc
diff options
context:
space:
mode:
authorjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-31 07:36:24 +0000
committerjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-31 07:36:24 +0000
commit81be9bdbe8e380ea383c3ff0e3ef496524793fec (patch)
tree5953ac40c46438fcc4c2577f8cc370874b70180e /chrome/browser/renderer_host/database_permission_request.cc
parent7cc9929276a9a927ef3589109717f0765239e2af (diff)
downloadchromium_src-81be9bdbe8e380ea383c3ff0e3ef496524793fec.zip
chromium_src-81be9bdbe8e380ea383c3ff0e3ef496524793fec.tar.gz
chromium_src-81be9bdbe8e380ea383c3ff0e3ef496524793fec.tar.bz2
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@43183 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.cc7
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) {