From 57a777f7584961290e87e6e4149c0ed042334425 Mon Sep 17 00:00:00 2001 From: "rafaelw@chromium.org" Date: Wed, 31 Mar 2010 01:09:42 +0000 Subject: Hook up extension apps notification permission, take two This is the chromium side of a change which will wait to land on the webkit side landing. (https://bugs.webkit.org/show_bug.cgi?id=36625) It changes the NotificationPresenter to pass the sourceURL, rather than the SecurityOrigin in checking permission. The full URL is required to match the app extent. BUG=32361, 31024 TEST=NONE Review URL: http://codereview.chromium.org/1383001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43162 0039d316-1c4b-4281-b951-d872f2087c98 --- webkit/database/database_tracker.cc | 5 +++++ webkit/database/database_tracker.h | 1 + 2 files changed, 6 insertions(+) (limited to 'webkit/database') diff --git a/webkit/database/database_tracker.cc b/webkit/database/database_tracker.cc index ea1994e..38c6298 100644 --- a/webkit/database/database_tracker.cc +++ b/webkit/database/database_tracker.cc @@ -208,6 +208,11 @@ void DatabaseTracker::SetOriginQuotaInMemory(const string16& origin_identifier, in_memory_quotas_[origin_identifier] = new_quota; } +void DatabaseTracker::ResetOriginQuotaInMemory( + const string16& origin_identifier) { + in_memory_quotas_.erase(origin_identifier); +} + bool DatabaseTracker::DeleteClosedDatabase(const string16& origin_identifier, const string16& database_name) { if (!LazyInit()) diff --git a/webkit/database/database_tracker.h b/webkit/database/database_tracker.h index d1d5a43..f7468e4 100644 --- a/webkit/database/database_tracker.h +++ b/webkit/database/database_tracker.h @@ -126,6 +126,7 @@ class DatabaseTracker void SetOriginQuota(const string16& origin_identifier, int64 new_quota); void SetOriginQuotaInMemory(const string16& origin_identifier, int64 new_quota); + void ResetOriginQuotaInMemory(const string16& origin_identifier); int64 GetDefaultQuota() { return default_quota_; } // Sets the default quota for all origins. Should be used in tests only. -- cgit v1.1