Chromium Code Reviews| OLD | NEW |
|---|---|
| (Empty) | |
| 1 // Copyright 2017 The Chromium Authors. All rights reserved. | |
| 2 // Use of this source code is governed by a BSD-style license that can be | |
| 3 // found in the LICENSE file. | |
| 4 | |
| 5 #include "chrome/browser/browsing_data/browsing_data_important_sites_util.h" | |
| 6 | |
| 7 #include "content/public/browser/browsing_data_filter_builder.h" | |
| 8 | |
| 9 namespace browsing_data_important_sites_util { | |
| 10 | |
| 11 void Remove(int remove_mask, | |
| 12 int origin_mask, | |
| 13 browsing_data::TimePeriod time_period, | |
| 14 const std::vector<std::string>& excluded_domains, | |
| 15 BrowsingDataRemover* remover, | |
| 16 BrowsingDataRemover::Observer* observer) { | |
| 17 int filterable_mask = | |
| 18 remove_mask & BrowsingDataRemover::IMPORTANT_SITES_DATATYPES; | |
| 19 int nonfilterable_mask = | |
| 20 remove_mask & ~BrowsingDataRemover::IMPORTANT_SITES_DATATYPES; | |
| 21 | |
| 22 std::unique_ptr<content::BrowsingDataFilterBuilder> filter_builder( | |
|
dmurph
2017/03/06 21:16:47
Unless I'm contradicting something, can you bring
dullweber
2017/03/07 12:24:34
I moved it back. I think the relevant part that sh
| |
| 23 content::BrowsingDataFilterBuilder::Create( | |
| 24 content::BrowsingDataFilterBuilder::BLACKLIST)); | |
| 25 for (const std::string& domain : excluded_domains) { | |
| 26 filter_builder->AddRegisterableDomain(domain); | |
| 27 } | |
| 28 | |
| 29 browsing_data::RecordDeletionForPeriod(time_period); | |
| 30 | |
| 31 if (filterable_mask) { | |
| 32 remover->RemoveWithFilterAndReply( | |
| 33 browsing_data::CalculateBeginDeleteTime(time_period), | |
| 34 browsing_data::CalculateEndDeleteTime(time_period), filterable_mask, | |
| 35 origin_mask, std::move(filter_builder), observer); | |
| 36 } else { | |
| 37 // Make sure |observer| doesn't wait for the filtered task. | |
| 38 observer->OnBrowsingDataRemoverDone(); | |
| 39 } | |
| 40 | |
| 41 if (nonfilterable_mask) { | |
| 42 remover->RemoveAndReply( | |
| 43 browsing_data::CalculateBeginDeleteTime(time_period), | |
| 44 browsing_data::CalculateEndDeleteTime(time_period), nonfilterable_mask, | |
| 45 origin_mask, observer); | |
| 46 } else { | |
| 47 // Make sure |observer| doesn't wait for the non-filtered task. | |
| 48 observer->OnBrowsingDataRemoverDone(); | |
| 49 } | |
| 50 } | |
| 51 | |
| 52 } // namespace browsing_data_important_sites_util | |
| OLD | NEW |