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