Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(201)

Unified Diff: chrome/browser/android/browsing_data/browsing_data_bridge.cc

Issue 2716333002: Implement important sites dialog for desktop. (Closed)
Patch Set: remove favicon Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/android/browsing_data/browsing_data_bridge.cc
diff --git a/chrome/browser/android/browsing_data/browsing_data_bridge.cc b/chrome/browser/android/browsing_data/browsing_data_bridge.cc
index 170a27f5983b10ca5551b614f7b0a6bc9431aa22..c58893cf84367f63646ce0bffffbeb6579844fab 100644
--- a/chrome/browser/android/browsing_data/browsing_data_bridge.cc
+++ b/chrome/browser/android/browsing_data/browsing_data_bridge.cc
@@ -19,6 +19,7 @@
#include "base/metrics/histogram_macros.h"
#include "base/scoped_observer.h"
#include "base/values.h"
+#include "chrome/browser/browsing_data/browsing_data_important_sites_util.h"
#include "chrome/browser/browsing_data/browsing_data_remover_factory.h"
#include "chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h"
#include "chrome/browser/engagement/important_sites_util.h"
@@ -158,15 +159,6 @@ static void ClearBrowsingData(
ignoring_domains, ignoring_domain_reasons);
}
- // Delete the types protected by Important Sites with a filter,
- // and the rest completely.
- int filterable_mask =
- remove_mask &
- ChromeBrowsingDataRemoverDelegate::IMPORTANT_SITES_DATA_TYPES;
- int nonfilterable_mask =
- remove_mask &
- ~ChromeBrowsingDataRemoverDelegate::IMPORTANT_SITES_DATA_TYPES;
-
// ClearBrowsingDataObserver deletes itself when |browsing_data_remover| is
// done with both removal tasks.
ClearBrowsingDataObserver* observer = new ClearBrowsingDataObserver(
@@ -174,28 +166,10 @@ static void ClearBrowsingData(
browsing_data::TimePeriod period =
static_cast<browsing_data::TimePeriod>(time_period);
- browsing_data::RecordDeletionForPeriod(period);
-
- if (filterable_mask) {
- browsing_data_remover->RemoveWithFilterAndReply(
- browsing_data::CalculateBeginDeleteTime(period),
- browsing_data::CalculateEndDeleteTime(period), filterable_mask,
- BrowsingDataRemover::ORIGIN_TYPE_UNPROTECTED_WEB,
- std::move(filter_builder), observer);
- } else {
- // Make sure |observer| doesn't wait for the filtered task.
- observer->OnBrowsingDataRemoverDone();
- }
- if (nonfilterable_mask) {
- browsing_data_remover->RemoveAndReply(
- browsing_data::CalculateBeginDeleteTime(period),
- browsing_data::CalculateEndDeleteTime(period), nonfilterable_mask,
- BrowsingDataRemover::ORIGIN_TYPE_UNPROTECTED_WEB, observer);
- } else {
- // Make sure |observer| doesn't wait for the non-filtered task.
- observer->OnBrowsingDataRemoverDone();
- }
+ browsing_data_important_sites_util::Remove(
+ remove_mask, BrowsingDataRemover::ORIGIN_TYPE_UNPROTECTED_WEB, period,
+ std::move(filter_builder), browsing_data_remover, observer);
}
static void ShowNoticeAboutOtherFormsOfBrowsingHistory(

Powered by Google App Engine
This is Rietveld 408576698