summaryrefslogtreecommitdiffstats
path: root/chrome/browser/cookie_modal_dialog.cc
diff options
context:
space:
mode:
authorjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-31 08:09:45 +0000
committerjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-31 08:09:45 +0000
commit0a1a4543882c0cf8b73a44d4d79f36c4e6d77fe9 (patch)
treefcf3bff8df2138387cb0ad397460216fc05a66dc /chrome/browser/cookie_modal_dialog.cc
parent28dd598b6433c08e58e261538af94b8aa5edff60 (diff)
downloadchromium_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/cookie_modal_dialog.cc')
-rw-r--r--chrome/browser/cookie_modal_dialog.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/browser/cookie_modal_dialog.cc b/chrome/browser/cookie_modal_dialog.cc
index 45347dc..4435bcb 100644
--- a/chrome/browser/cookie_modal_dialog.cc
+++ b/chrome/browser/cookie_modal_dialog.cc
@@ -50,12 +50,16 @@ CookiePromptModalDialog::CookiePromptModalDialog(
HostContentSettingsMap* host_content_settings_map,
const GURL& origin,
const string16& database_name,
+ const string16& display_name,
+ unsigned long estimated_size,
CookiePromptModalDialogDelegate* delegate)
: AppModalDialog(tab_contents, std::wstring()),
host_content_settings_map_(host_content_settings_map),
dialog_type_(DIALOG_TYPE_DATABASE),
origin_(origin),
database_name_(database_name),
+ display_name_(display_name),
+ estimated_size_(estimated_size),
delegate_(delegate) {
}