diff options
Diffstat (limited to 'webkit/database/database_tracker.cc')
| -rw-r--r-- | webkit/database/database_tracker.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/webkit/database/database_tracker.cc b/webkit/database/database_tracker.cc index a37c2a0..8a8a21d 100644 --- a/webkit/database/database_tracker.cc +++ b/webkit/database/database_tracker.cc @@ -4,6 +4,7 @@ #include "webkit/database/database_tracker.h" +#include <algorithm> #include <vector> #include "app/sql/connection.h" @@ -520,6 +521,7 @@ int DatabaseTracker::DeleteDatabase(const string16& origin_identifier, int DatabaseTracker::DeleteDataModifiedSince( const base::Time& cutoff, + const std::vector<string16>& protected_origins, net::CompletionCallback* callback) { if (!LazyInit()) return net::ERR_FAILED; @@ -536,6 +538,12 @@ int DatabaseTracker::DeleteDataModifiedSince( ori != origins.end(); ++ori) { if (StartsWith(*ori, ASCIIToUTF16(kExtensionOriginIdentifierPrefix), true)) continue; + + std::vector<string16>::const_iterator find_iter = + std::find(protected_origins.begin(), protected_origins.end(), *ori); + if (find_iter != protected_origins.end()) + continue; + std::vector<DatabaseDetails> details; if (!databases_table_->GetAllDatabaseDetailsForOrigin(*ori, &details)) rv = net::ERR_FAILED; |