| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/browsing_data_remover.h" | 5 #include "chrome/browser/browsing_data/browsing_data_remover.h" |
| 6 | 6 |
| 7 #include <map> | 7 #include <map> |
| 8 #include <set> | 8 #include <set> |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| (...skipping 766 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 777 password_manager::PasswordStore* password_store = | 777 password_manager::PasswordStore* password_store = |
| 778 PasswordStoreFactory::GetForProfile(profile_, | 778 PasswordStoreFactory::GetForProfile(profile_, |
| 779 ServiceAccessType::EXPLICIT_ACCESS) | 779 ServiceAccessType::EXPLICIT_ACCESS) |
| 780 .get(); | 780 .get(); |
| 781 | 781 |
| 782 if (password_store) { | 782 if (password_store) { |
| 783 waiting_for_clear_auto_sign_in_ = true; | 783 waiting_for_clear_auto_sign_in_ = true; |
| 784 base::Closure on_cleared_auto_sign_in = | 784 base::Closure on_cleared_auto_sign_in = |
| 785 base::Bind(&BrowsingDataRemover::OnClearedAutoSignIn, | 785 base::Bind(&BrowsingDataRemover::OnClearedAutoSignIn, |
| 786 weak_ptr_factory_.GetWeakPtr()); | 786 weak_ptr_factory_.GetWeakPtr()); |
| 787 password_store->DisableAutoSignInForAllLogins(on_cleared_auto_sign_in); | 787 password_store->DisableAutoSignInForOrigins( |
| 788 filter, on_cleared_auto_sign_in); |
| 788 } | 789 } |
| 789 } | 790 } |
| 790 | 791 |
| 791 if (remove_mask & REMOVE_HISTORY) { | 792 if (remove_mask & REMOVE_HISTORY) { |
| 792 password_manager::PasswordStore* password_store = | 793 password_manager::PasswordStore* password_store = |
| 793 PasswordStoreFactory::GetForProfile( | 794 PasswordStoreFactory::GetForProfile( |
| 794 profile_, ServiceAccessType::EXPLICIT_ACCESS).get(); | 795 profile_, ServiceAccessType::EXPLICIT_ACCESS).get(); |
| 795 | 796 |
| 796 if (password_store) { | 797 if (password_store) { |
| 797 waiting_for_clear_passwords_stats_ = true; | 798 waiting_for_clear_passwords_stats_ = true; |
| (...skipping 514 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1312 waiting_for_clear_domain_reliability_monitor_ = false; | 1313 waiting_for_clear_domain_reliability_monitor_ = false; |
| 1313 NotifyIfDone(); | 1314 NotifyIfDone(); |
| 1314 } | 1315 } |
| 1315 | 1316 |
| 1316 // static | 1317 // static |
| 1317 BrowsingDataRemover::CallbackSubscription | 1318 BrowsingDataRemover::CallbackSubscription |
| 1318 BrowsingDataRemover::RegisterOnBrowsingDataRemovedCallback( | 1319 BrowsingDataRemover::RegisterOnBrowsingDataRemovedCallback( |
| 1319 const BrowsingDataRemover::Callback& callback) { | 1320 const BrowsingDataRemover::Callback& callback) { |
| 1320 return GetOnBrowsingDataRemovedCallbacks()->Add(callback); | 1321 return GetOnBrowsingDataRemovedCallbacks()->Add(callback); |
| 1321 } | 1322 } |
| OLD | NEW |