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 583 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
594 base::Bind(&WebsiteSettingsFilterAdapter, filter)); | 594 base::Bind(&WebsiteSettingsFilterAdapter, filter)); |
595 } | 595 } |
596 | 596 |
597 if ((remove_mask & BrowsingDataRemover::REMOVE_SITE_USAGE_DATA) || | 597 if ((remove_mask & BrowsingDataRemover::REMOVE_SITE_USAGE_DATA) || |
598 (remove_mask & BrowsingDataRemover::REMOVE_HISTORY)) { | 598 (remove_mask & BrowsingDataRemover::REMOVE_HISTORY)) { |
599 HostContentSettingsMapFactory::GetForProfile(profile_) | 599 HostContentSettingsMapFactory::GetForProfile(profile_) |
600 ->ClearSettingsForOneTypeWithPredicate( | 600 ->ClearSettingsForOneTypeWithPredicate( |
601 CONTENT_SETTINGS_TYPE_APP_BANNER, | 601 CONTENT_SETTINGS_TYPE_APP_BANNER, |
602 base::Bind(&WebsiteSettingsFilterAdapter, filter)); | 602 base::Bind(&WebsiteSettingsFilterAdapter, filter)); |
603 | 603 |
604 PermissionDecisionAutoBlocker::RemoveCountsByUrl(profile_, filter); | 604 PermissionDecisionAutoBlocker::GetForProfile(profile_)->RemoveCountsByUrl( |
| 605 filter); |
605 } | 606 } |
606 | 607 |
607 ////////////////////////////////////////////////////////////////////////////// | 608 ////////////////////////////////////////////////////////////////////////////// |
608 // Password manager | 609 // Password manager |
609 if (remove_mask & BrowsingDataRemover::REMOVE_PASSWORDS) { | 610 if (remove_mask & BrowsingDataRemover::REMOVE_PASSWORDS) { |
610 content::RecordAction(UserMetricsAction("ClearBrowsingData_Passwords")); | 611 content::RecordAction(UserMetricsAction("ClearBrowsingData_Passwords")); |
611 password_manager::PasswordStore* password_store = | 612 password_manager::PasswordStore* password_store = |
612 PasswordStoreFactory::GetForProfile( | 613 PasswordStoreFactory::GetForProfile( |
613 profile_, ServiceAccessType::EXPLICIT_ACCESS).get(); | 614 profile_, ServiceAccessType::EXPLICIT_ACCESS).get(); |
614 | 615 |
(...skipping 281 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
896 | 897 |
897 #if defined(OS_CHROMEOS) | 898 #if defined(OS_CHROMEOS) |
898 void ChromeBrowsingDataRemoverDelegate::OnClearPlatformKeys( | 899 void ChromeBrowsingDataRemoverDelegate::OnClearPlatformKeys( |
899 chromeos::DBusMethodCallStatus call_status, | 900 chromeos::DBusMethodCallStatus call_status, |
900 bool result) { | 901 bool result) { |
901 LOG_IF(ERROR, call_status != chromeos::DBUS_METHOD_CALL_SUCCESS || !result) | 902 LOG_IF(ERROR, call_status != chromeos::DBUS_METHOD_CALL_SUCCESS || !result) |
902 << "Failed to clear platform keys."; | 903 << "Failed to clear platform keys."; |
903 clear_platform_keys_.GetCompletionCallback().Run(); | 904 clear_platform_keys_.GetCompletionCallback().Run(); |
904 } | 905 } |
905 #endif | 906 #endif |
OLD | NEW |