| 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 628 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 639 base::Bind(&WebsiteSettingsFilterAdapter, filter)); | 639 base::Bind(&WebsiteSettingsFilterAdapter, filter)); |
| 640 } | 640 } |
| 641 | 641 |
| 642 if ((remove_mask & BrowsingDataRemover::REMOVE_SITE_USAGE_DATA) || | 642 if ((remove_mask & BrowsingDataRemover::REMOVE_SITE_USAGE_DATA) || |
| 643 (remove_mask & BrowsingDataRemover::REMOVE_HISTORY)) { | 643 (remove_mask & BrowsingDataRemover::REMOVE_HISTORY)) { |
| 644 HostContentSettingsMapFactory::GetForProfile(profile_) | 644 HostContentSettingsMapFactory::GetForProfile(profile_) |
| 645 ->ClearSettingsForOneTypeWithPredicate( | 645 ->ClearSettingsForOneTypeWithPredicate( |
| 646 CONTENT_SETTINGS_TYPE_APP_BANNER, | 646 CONTENT_SETTINGS_TYPE_APP_BANNER, |
| 647 base::Bind(&WebsiteSettingsFilterAdapter, filter)); | 647 base::Bind(&WebsiteSettingsFilterAdapter, filter)); |
| 648 | 648 |
| 649 PermissionDecisionAutoBlocker::RemoveCountsByUrl(profile_, filter); | 649 PermissionDecisionAutoBlocker::GetForProfile(profile_)->RemoveCountsByUrl( |
| 650 filter); |
| 650 } | 651 } |
| 651 | 652 |
| 652 ////////////////////////////////////////////////////////////////////////////// | 653 ////////////////////////////////////////////////////////////////////////////// |
| 653 // Password manager | 654 // Password manager |
| 654 if (remove_mask & BrowsingDataRemover::REMOVE_PASSWORDS) { | 655 if (remove_mask & BrowsingDataRemover::REMOVE_PASSWORDS) { |
| 655 content::RecordAction(UserMetricsAction("ClearBrowsingData_Passwords")); | 656 content::RecordAction(UserMetricsAction("ClearBrowsingData_Passwords")); |
| 656 password_manager::PasswordStore* password_store = | 657 password_manager::PasswordStore* password_store = |
| 657 PasswordStoreFactory::GetForProfile( | 658 PasswordStoreFactory::GetForProfile( |
| 658 profile_, ServiceAccessType::EXPLICIT_ACCESS).get(); | 659 profile_, ServiceAccessType::EXPLICIT_ACCESS).get(); |
| 659 | 660 |
| (...skipping 381 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1041 } | 1042 } |
| 1042 | 1043 |
| 1043 void ChromeBrowsingDataRemoverDelegate:: | 1044 void ChromeBrowsingDataRemoverDelegate:: |
| 1044 OnDeauthorizeFlashContentLicensesCompleted( | 1045 OnDeauthorizeFlashContentLicensesCompleted( |
| 1045 uint32_t request_id, | 1046 uint32_t request_id, |
| 1046 bool /* success */) { | 1047 bool /* success */) { |
| 1047 DCHECK_EQ(request_id, deauthorize_flash_content_licenses_request_id_); | 1048 DCHECK_EQ(request_id, deauthorize_flash_content_licenses_request_id_); |
| 1048 clear_flash_content_licenses_.GetCompletionCallback().Run(); | 1049 clear_flash_content_licenses_.GetCompletionCallback().Run(); |
| 1049 } | 1050 } |
| 1050 #endif | 1051 #endif |
| OLD | NEW |