diff options
| author | Ben Murdoch <benm@google.com> | 2010-11-18 18:32:45 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-11-18 18:38:07 +0000 |
| commit | 513209b27ff55e2841eac0e4120199c23acce758 (patch) | |
| tree | aeba30bb08c5f47c57003544e378a377c297eee6 /chrome/browser/tab_contents/tab_specific_content_settings.cc | |
| parent | 164f7496de0fbee436b385a79ead9e3cb81a50c1 (diff) | |
| download | external_chromium-513209b27ff55e2841eac0e4120199c23acce758.zip external_chromium-513209b27ff55e2841eac0e4120199c23acce758.tar.gz external_chromium-513209b27ff55e2841eac0e4120199c23acce758.tar.bz2 | |
Merge Chromium at r65505: Initial merge by git.
Change-Id: I31d8f1d8cd33caaf7f47ffa7350aef42d5fbdb45
Diffstat (limited to 'chrome/browser/tab_contents/tab_specific_content_settings.cc')
| -rw-r--r-- | chrome/browser/tab_contents/tab_specific_content_settings.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/chrome/browser/tab_contents/tab_specific_content_settings.cc b/chrome/browser/tab_contents/tab_specific_content_settings.cc index f0989a3..edafe6c 100644 --- a/chrome/browser/tab_contents/tab_specific_content_settings.cc +++ b/chrome/browser/tab_contents/tab_specific_content_settings.cc @@ -110,16 +110,15 @@ void TabSpecificContentSettings::OnCookieAccessed( void TabSpecificContentSettings::OnIndexedDBAccessed( const GURL& url, - const string16& name, const string16& description, bool blocked_by_policy) { if (blocked_by_policy) { blocked_local_shared_objects_.indexed_dbs()->AddIndexedDB( - url, name, description); + url, description); OnContentBlocked(CONTENT_SETTINGS_TYPE_COOKIES, std::string()); }else { allowed_local_shared_objects_.indexed_dbs()->AddIndexedDB( - url, name, description); + url, description); OnContentAccessed(CONTENT_SETTINGS_TYPE_COOKIES); } } |