Chromium Code Reviews| 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 819 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 830 if (data_manager) | 830 if (data_manager) |
| 831 data_manager->Refresh(); | 831 data_manager->Refresh(); |
| 832 } | 832 } |
| 833 } | 833 } |
| 834 | 834 |
| 835 if (remove_mask & REMOVE_CACHE) { | 835 if (remove_mask & REMOVE_CACHE) { |
| 836 // Tell the renderers to clear their cache. | 836 // Tell the renderers to clear their cache. |
| 837 web_cache::WebCacheManager::GetInstance()->ClearCache(); | 837 web_cache::WebCacheManager::GetInstance()->ClearCache(); |
| 838 | 838 |
| 839 content::RecordAction(UserMetricsAction("ClearBrowsingData_Cache")); | 839 content::RecordAction(UserMetricsAction("ClearBrowsingData_Cache")); |
| 840 } | |
| 840 | 841 |
| 842 if (remove_mask & REMOVE_CACHE || remove_mask & REMOVE_COOKIES || | |
| 843 remove_mask & REMOVE_PASSWORDS) { | |
|
msramek
2016/06/30 11:36:20
This is not correct.
Yes, you will delete the HTT
Tomasz Moniuszko
2016/07/01 12:44:02
Done.
| |
| 841 waiting_for_clear_cache_ = true; | 844 waiting_for_clear_cache_ = true; |
| 842 // StoragePartitionHttpCacheDataRemover deletes itself when it is done. | 845 // StoragePartitionHttpCacheDataRemover deletes itself when it is done. |
| 843 if (filter_builder.IsEmptyBlacklist()) { | 846 if (filter_builder.IsEmptyBlacklist()) { |
| 844 browsing_data::StoragePartitionHttpCacheDataRemover::CreateForRange( | 847 browsing_data::StoragePartitionHttpCacheDataRemover::CreateForRange( |
| 845 BrowserContext::GetDefaultStoragePartition(profile_), | 848 BrowserContext::GetDefaultStoragePartition(profile_), |
| 846 delete_begin_, delete_end_) | 849 delete_begin_, delete_end_) |
| 847 ->Remove(base::Bind(&BrowsingDataRemover::ClearedCache, | 850 ->Remove(base::Bind(&BrowsingDataRemover::ClearedCache, |
| 848 weak_ptr_factory_.GetWeakPtr())); | 851 weak_ptr_factory_.GetWeakPtr())); |
| 849 } else { | 852 } else { |
| 850 browsing_data::StoragePartitionHttpCacheDataRemover:: | 853 browsing_data::StoragePartitionHttpCacheDataRemover:: |
| 851 CreateForURLsAndRange( | 854 CreateForURLsAndRange( |
| 852 BrowserContext::GetDefaultStoragePartition(profile_), | 855 BrowserContext::GetDefaultStoragePartition(profile_), |
| 853 filter, delete_begin_, delete_end_) | 856 filter, delete_begin_, delete_end_) |
| 854 ->Remove(base::Bind(&BrowsingDataRemover::ClearedCache, | 857 ->Remove(base::Bind(&BrowsingDataRemover::ClearedCache, |
| 855 weak_ptr_factory_.GetWeakPtr())); | 858 weak_ptr_factory_.GetWeakPtr())); |
| 856 } | 859 } |
| 860 } | |
| 857 | 861 |
| 862 if (remove_mask & REMOVE_CACHE) { | |
| 858 #if !defined(DISABLE_NACL) | 863 #if !defined(DISABLE_NACL) |
| 859 waiting_for_clear_nacl_cache_ = true; | 864 waiting_for_clear_nacl_cache_ = true; |
| 860 | 865 |
| 861 BrowserThread::PostTask( | 866 BrowserThread::PostTask( |
| 862 BrowserThread::IO, FROM_HERE, | 867 BrowserThread::IO, FROM_HERE, |
| 863 base::Bind(&ClearNaClCacheOnIOThread, | 868 base::Bind(&ClearNaClCacheOnIOThread, |
| 864 UIThreadTrampoline( | 869 UIThreadTrampoline( |
| 865 base::Bind(&BrowsingDataRemover::ClearedNaClCache, | 870 base::Bind(&BrowsingDataRemover::ClearedNaClCache, |
| 866 weak_ptr_factory_.GetWeakPtr())))); | 871 weak_ptr_factory_.GetWeakPtr())))); |
| 867 | 872 |
| (...skipping 468 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1336 waiting_for_clear_domain_reliability_monitor_ = false; | 1341 waiting_for_clear_domain_reliability_monitor_ = false; |
| 1337 NotifyIfDone(); | 1342 NotifyIfDone(); |
| 1338 } | 1343 } |
| 1339 | 1344 |
| 1340 // static | 1345 // static |
| 1341 BrowsingDataRemover::CallbackSubscription | 1346 BrowsingDataRemover::CallbackSubscription |
| 1342 BrowsingDataRemover::RegisterOnBrowsingDataRemovedCallback( | 1347 BrowsingDataRemover::RegisterOnBrowsingDataRemovedCallback( |
| 1343 const BrowsingDataRemover::Callback& callback) { | 1348 const BrowsingDataRemover::Callback& callback) { |
| 1344 return GetOnBrowsingDataRemovedCallbacks()->Add(callback); | 1349 return GetOnBrowsingDataRemovedCallbacks()->Add(callback); |
| 1345 } | 1350 } |
| OLD | NEW |