Index: chrome/browser/extensions/activity_log/fullstream_ui_policy.cc |
diff --git a/chrome/browser/extensions/activity_log/fullstream_ui_policy.cc b/chrome/browser/extensions/activity_log/fullstream_ui_policy.cc |
index b2a6737a2bb9d72ac120413209bc5e6d2d30a3ef..c96e91211e4d1ecf9a495b95a588dfa2d02e2076 100644 |
--- a/chrome/browser/extensions/activity_log/fullstream_ui_policy.cc |
+++ b/chrome/browser/extensions/activity_log/fullstream_ui_policy.cc |
@@ -220,6 +220,42 @@ scoped_ptr<Action::ActionVector> FullStreamUIPolicy::DoReadFilteredData( |
return actions.Pass(); |
} |
+void FullStreamUIPolicy::DoRemoveActions(const std::vector<int64>& action_ids) { |
+ if (action_ids.empty()) |
+ return; |
+ |
+ sql::Connection* db = GetDatabaseConnection(); |
+ if (!db) { |
+ LOG(ERROR) << "Unable to connect to database"; |
+ return; |
+ } |
+ |
+ // Flush data first so the activity removal affects queued-up data as well. |
+ activity_database()->AdviseFlush(ActivityDatabase::kFlushImmediately); |
+ |
+ sql::Transaction transaction(db); |
+ if (!transaction.Begin()) |
+ return; |
+ |
+ std::string statement_str = |
+ base::StringPrintf("DELETE FROM %s WHERE rowid = ?", kTableName); |
+ sql::Statement statement(db->GetCachedStatement( |
+ sql::StatementID(SQL_FROM_HERE), statement_str.c_str())); |
+ for (size_t i = 0; i < action_ids.size(); i++) { |
+ statement.Reset(true); |
+ statement.BindInt64(0, action_ids[i]); |
+ if (!statement.Run()) { |
+ LOG(ERROR) << "Removing activities from database failed: " |
+ << statement.GetSQLStatement(); |
+ return; |
+ } |
+ } |
+ |
+ if (!transaction.Commit()) { |
+ LOG(ERROR) << "Removing activities from database failed"; |
+ } |
+} |
+ |
void FullStreamUIPolicy::DoRemoveURLs(const std::vector<GURL>& restrict_urls) { |
sql::Connection* db = GetDatabaseConnection(); |
if (!db) { |
@@ -374,6 +410,10 @@ void FullStreamUIPolicy::ReadFilteredData( |
callback); |
} |
+void FullStreamUIPolicy::RemoveActions(const std::vector<int64>& action_ids) { |
+ ScheduleAndForget(this, &FullStreamUIPolicy::DoRemoveActions, action_ids); |
+} |
+ |
void FullStreamUIPolicy::RemoveURLs(const std::vector<GURL>& restrict_urls) { |
ScheduleAndForget(this, &FullStreamUIPolicy::DoRemoveURLs, restrict_urls); |
} |