| 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 "chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h" | 5 #include "chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h" |
| 6 | 6 |
| 7 #include <set> | 7 #include <set> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <utility> | 9 #include <utility> |
| 10 | 10 |
| (...skipping 710 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 721 } | 721 } |
| 722 } | 722 } |
| 723 } | 723 } |
| 724 | 724 |
| 725 MediaDeviceIDSalt::Reset(profile_->GetPrefs()); | 725 MediaDeviceIDSalt::Reset(profile_->GetPrefs()); |
| 726 } | 726 } |
| 727 | 727 |
| 728 ////////////////////////////////////////////////////////////////////////////// | 728 ////////////////////////////////////////////////////////////////////////////// |
| 729 // DATA_TYPE_CONTENT_SETTINGS | 729 // DATA_TYPE_CONTENT_SETTINGS |
| 730 if (remove_mask & DATA_TYPE_CONTENT_SETTINGS) { | 730 if (remove_mask & DATA_TYPE_CONTENT_SETTINGS) { |
| 731 base::RecordAction(UserMetricsAction("ClearBrowsingData_ContentSettings")); |
| 731 const auto* registry = | 732 const auto* registry = |
| 732 content_settings::ContentSettingsRegistry::GetInstance(); | 733 content_settings::ContentSettingsRegistry::GetInstance(); |
| 733 auto* map = HostContentSettingsMapFactory::GetForProfile(profile_); | 734 auto* map = HostContentSettingsMapFactory::GetForProfile(profile_); |
| 734 for (const content_settings::ContentSettingsInfo* info : *registry) { | 735 for (const content_settings::ContentSettingsInfo* info : *registry) { |
| 735 map->ClearSettingsForOneTypeWithPredicate( | 736 map->ClearSettingsForOneTypeWithPredicate( |
| 736 info->website_settings_info()->type(), delete_begin_, | 737 info->website_settings_info()->type(), delete_begin_, |
| 737 base::Bind(&WebsiteSettingsFilterAdapter, filter)); | 738 base::Bind(&WebsiteSettingsFilterAdapter, filter)); |
| 738 } | 739 } |
| 739 } | 740 } |
| 740 | 741 |
| (...skipping 452 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1193 } | 1194 } |
| 1194 | 1195 |
| 1195 void ChromeBrowsingDataRemoverDelegate:: | 1196 void ChromeBrowsingDataRemoverDelegate:: |
| 1196 OnDeauthorizeFlashContentLicensesCompleted( | 1197 OnDeauthorizeFlashContentLicensesCompleted( |
| 1197 uint32_t request_id, | 1198 uint32_t request_id, |
| 1198 bool /* success */) { | 1199 bool /* success */) { |
| 1199 DCHECK_EQ(request_id, deauthorize_flash_content_licenses_request_id_); | 1200 DCHECK_EQ(request_id, deauthorize_flash_content_licenses_request_id_); |
| 1200 clear_flash_content_licenses_.GetCompletionCallback().Run(); | 1201 clear_flash_content_licenses_.GetCompletionCallback().Run(); |
| 1201 } | 1202 } |
| 1202 #endif | 1203 #endif |
| OLD | NEW |