| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ios/chrome/browser/browsing_data/browsing_data_remover_helper.h" | 5 #include "ios/chrome/browser/browsing_data/browsing_data_remover_helper.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "ios/chrome/browser/browser_state/chrome_browser_state.h" | 9 #include "ios/chrome/browser/browser_state/chrome_browser_state.h" |
| 10 | 10 |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 51 pending_removals_iter->second->remove_mask |= remove_mask; | 51 pending_removals_iter->second->remove_mask |= remove_mask; |
| 52 pending_removals_iter->second->callbacks.push_back(callback); | 52 pending_removals_iter->second->callbacks.push_back(callback); |
| 53 } | 53 } |
| 54 } else { | 54 } else { |
| 55 std::unique_ptr<BrowsingDataRemovalInfo> removal_info( | 55 std::unique_ptr<BrowsingDataRemovalInfo> removal_info( |
| 56 new BrowsingDataRemovalInfo(remove_mask, time_period, callback)); | 56 new BrowsingDataRemovalInfo(remove_mask, time_period, callback)); |
| 57 DoRemove(browser_state, std::move(removal_info)); | 57 DoRemove(browser_state, std::move(removal_info)); |
| 58 } | 58 } |
| 59 } | 59 } |
| 60 | 60 |
| 61 void BrowsingDataRemoverHelper::Remove(ios::ChromeBrowserState* browser_state, | |
| 62 int remove_mask, | |
| 63 const base::Closure& callback) { | |
| 64 Remove(browser_state, remove_mask, browsing_data::ALL_TIME, callback); | |
| 65 } | |
| 66 | |
| 67 void BrowsingDataRemoverHelper::OnIOSChromeBrowsingDataRemoverDone() { | 61 void BrowsingDataRemoverHelper::OnIOSChromeBrowsingDataRemoverDone() { |
| 68 current_remover_ = nullptr; | 62 current_remover_ = nullptr; |
| 69 | 63 |
| 70 DCHECK(current_removal_info_); | 64 DCHECK(current_removal_info_); |
| 71 // Inform clients of the currently finished removal operation that browsing | 65 // Inform clients of the currently finished removal operation that browsing |
| 72 // data was removed. | 66 // data was removed. |
| 73 for (const auto& callback : current_removal_info_->callbacks) { | 67 for (const auto& callback : current_removal_info_->callbacks) { |
| 74 if (!callback.is_null()) { | 68 if (!callback.is_null()) { |
| 75 callback.Run(); | 69 callback.Run(); |
| 76 } | 70 } |
| (...skipping 20 matching lines...) Expand all Loading... |
| 97 | 91 |
| 98 // IOSChromeBrowsingDataRemover deletes itself. | 92 // IOSChromeBrowsingDataRemover deletes itself. |
| 99 IOSChromeBrowsingDataRemover* remover = | 93 IOSChromeBrowsingDataRemover* remover = |
| 100 IOSChromeBrowsingDataRemover::CreateForPeriod( | 94 IOSChromeBrowsingDataRemover::CreateForPeriod( |
| 101 browser_state, current_removal_info_->time_period); | 95 browser_state, current_removal_info_->time_period); |
| 102 remover->AddObserver(this); | 96 remover->AddObserver(this); |
| 103 current_remover_ = remover; | 97 current_remover_ = remover; |
| 104 int remove_mask = current_removal_info_->remove_mask; | 98 int remove_mask = current_removal_info_->remove_mask; |
| 105 remover->Remove(remove_mask); | 99 remover->Remove(remove_mask); |
| 106 } | 100 } |
| OLD | NEW |