| 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 685 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 696 } | 696 } |
| 697 | 697 |
| 698 MediaDeviceIDSalt::Reset(profile_->GetPrefs()); | 698 MediaDeviceIDSalt::Reset(profile_->GetPrefs()); |
| 699 } | 699 } |
| 700 | 700 |
| 701 ////////////////////////////////////////////////////////////////////////////// | 701 ////////////////////////////////////////////////////////////////////////////// |
| 702 // DATA_TYPE_DURABLE_PERMISSION | 702 // DATA_TYPE_DURABLE_PERMISSION |
| 703 if (remove_mask & DATA_TYPE_DURABLE_PERMISSION) { | 703 if (remove_mask & DATA_TYPE_DURABLE_PERMISSION) { |
| 704 HostContentSettingsMapFactory::GetForProfile(profile_) | 704 HostContentSettingsMapFactory::GetForProfile(profile_) |
| 705 ->ClearSettingsForOneTypeWithPredicate( | 705 ->ClearSettingsForOneTypeWithPredicate( |
| 706 CONTENT_SETTINGS_TYPE_DURABLE_STORAGE, | 706 CONTENT_SETTINGS_TYPE_DURABLE_STORAGE, base::Time(), |
| 707 base::Bind(&WebsiteSettingsFilterAdapter, filter)); | 707 base::Bind(&WebsiteSettingsFilterAdapter, filter)); |
| 708 } | 708 } |
| 709 | 709 |
| 710 ////////////////////////////////////////////////////////////////////////////// | 710 ////////////////////////////////////////////////////////////////////////////// |
| 711 // DATA_TYPE_SITE_USAGE_DATA | 711 // DATA_TYPE_SITE_USAGE_DATA |
| 712 if (remove_mask & DATA_TYPE_SITE_USAGE_DATA) { | 712 if (remove_mask & DATA_TYPE_SITE_USAGE_DATA) { |
| 713 HostContentSettingsMapFactory::GetForProfile(profile_) | 713 HostContentSettingsMapFactory::GetForProfile(profile_) |
| 714 ->ClearSettingsForOneTypeWithPredicate( | 714 ->ClearSettingsForOneTypeWithPredicate( |
| 715 CONTENT_SETTINGS_TYPE_SITE_ENGAGEMENT, | 715 CONTENT_SETTINGS_TYPE_SITE_ENGAGEMENT, base::Time(), |
| 716 base::Bind(&WebsiteSettingsFilterAdapter, filter)); | 716 base::Bind(&WebsiteSettingsFilterAdapter, filter)); |
| 717 } | 717 } |
| 718 | 718 |
| 719 if ((remove_mask & DATA_TYPE_SITE_USAGE_DATA) || | 719 if ((remove_mask & DATA_TYPE_SITE_USAGE_DATA) || |
| 720 (remove_mask & DATA_TYPE_HISTORY)) { | 720 (remove_mask & DATA_TYPE_HISTORY)) { |
| 721 HostContentSettingsMapFactory::GetForProfile(profile_) | 721 HostContentSettingsMapFactory::GetForProfile(profile_) |
| 722 ->ClearSettingsForOneTypeWithPredicate( | 722 ->ClearSettingsForOneTypeWithPredicate( |
| 723 CONTENT_SETTINGS_TYPE_APP_BANNER, | 723 CONTENT_SETTINGS_TYPE_APP_BANNER, base::Time(), |
| 724 base::Bind(&WebsiteSettingsFilterAdapter, filter)); | 724 base::Bind(&WebsiteSettingsFilterAdapter, filter)); |
| 725 | 725 |
| 726 PermissionDecisionAutoBlocker::GetForProfile(profile_)->RemoveCountsByUrl( | 726 PermissionDecisionAutoBlocker::GetForProfile(profile_)->RemoveCountsByUrl( |
| 727 filter); | 727 filter); |
| 728 } | 728 } |
| 729 | 729 |
| 730 ////////////////////////////////////////////////////////////////////////////// | 730 ////////////////////////////////////////////////////////////////////////////// |
| 731 // Password manager | 731 // Password manager |
| 732 if (remove_mask & DATA_TYPE_PASSWORDS) { | 732 if (remove_mask & DATA_TYPE_PASSWORDS) { |
| 733 base::RecordAction(UserMetricsAction("ClearBrowsingData_Passwords")); | 733 base::RecordAction(UserMetricsAction("ClearBrowsingData_Passwords")); |
| (...skipping 398 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1132 } | 1132 } |
| 1133 | 1133 |
| 1134 void ChromeBrowsingDataRemoverDelegate:: | 1134 void ChromeBrowsingDataRemoverDelegate:: |
| 1135 OnDeauthorizeFlashContentLicensesCompleted( | 1135 OnDeauthorizeFlashContentLicensesCompleted( |
| 1136 uint32_t request_id, | 1136 uint32_t request_id, |
| 1137 bool /* success */) { | 1137 bool /* success */) { |
| 1138 DCHECK_EQ(request_id, deauthorize_flash_content_licenses_request_id_); | 1138 DCHECK_EQ(request_id, deauthorize_flash_content_licenses_request_id_); |
| 1139 clear_flash_content_licenses_.GetCompletionCallback().Run(); | 1139 clear_flash_content_licenses_.GetCompletionCallback().Run(); |
| 1140 } | 1140 } |
| 1141 #endif | 1141 #endif |
| OLD | NEW |