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 469 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
480 sb_service->url_request_context(); | 480 sb_service->url_request_context(); |
481 ++waiting_for_clear_cookies_count_; | 481 ++waiting_for_clear_cookies_count_; |
482 BrowserThread::PostTask( | 482 BrowserThread::PostTask( |
483 BrowserThread::IO, FROM_HERE, | 483 BrowserThread::IO, FROM_HERE, |
484 base::Bind(&BrowsingDataRemover::ClearCookiesOnIOThread, | 484 base::Bind(&BrowsingDataRemover::ClearCookiesOnIOThread, |
485 base::Unretained(this), base::Unretained(sb_context))); | 485 base::Unretained(this), base::Unretained(sb_context))); |
486 } | 486 } |
487 } | 487 } |
488 #endif | 488 #endif |
489 MediaDeviceIDSalt::Reset(profile_->GetPrefs()); | 489 MediaDeviceIDSalt::Reset(profile_->GetPrefs()); |
| 490 |
| 491 // TODO(mkwst): If we're not removing passwords, then clear the 'zero-click' |
| 492 // flag for all credentials in the password store. |
490 } | 493 } |
491 | 494 |
492 // Channel IDs are not separated for protected and unprotected web | 495 // Channel IDs are not separated for protected and unprotected web |
493 // origins. We check the origin_set_mask_ to prevent unintended deletion. | 496 // origins. We check the origin_set_mask_ to prevent unintended deletion. |
494 if (remove_mask & REMOVE_CHANNEL_IDS && | 497 if (remove_mask & REMOVE_CHANNEL_IDS && |
495 origin_set_mask_ & BrowsingDataHelper::UNPROTECTED_WEB) { | 498 origin_set_mask_ & BrowsingDataHelper::UNPROTECTED_WEB) { |
496 content::RecordAction( | 499 content::RecordAction( |
497 UserMetricsAction("ClearBrowsingData_ChannelIDs")); | 500 UserMetricsAction("ClearBrowsingData_ChannelIDs")); |
498 // Since we are running on the UI thread don't call GetURLRequestContext(). | 501 // Since we are running on the UI thread don't call GetURLRequestContext(). |
499 net::URLRequestContextGetter* rq_context = profile_->GetRequestContext(); | 502 net::URLRequestContextGetter* rq_context = profile_->GetRequestContext(); |
(...skipping 715 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1215 waiting_for_clear_domain_reliability_monitor_ = false; | 1218 waiting_for_clear_domain_reliability_monitor_ = false; |
1216 NotifyAndDeleteIfDone(); | 1219 NotifyAndDeleteIfDone(); |
1217 } | 1220 } |
1218 | 1221 |
1219 // static | 1222 // static |
1220 BrowsingDataRemover::CallbackSubscription | 1223 BrowsingDataRemover::CallbackSubscription |
1221 BrowsingDataRemover::RegisterOnBrowsingDataRemovedCallback( | 1224 BrowsingDataRemover::RegisterOnBrowsingDataRemovedCallback( |
1222 const BrowsingDataRemover::Callback& callback) { | 1225 const BrowsingDataRemover::Callback& callback) { |
1223 return GetOnBrowsingDataRemovedCallbacks()->Add(callback); | 1226 return GetOnBrowsingDataRemovedCallbacks()->Add(callback); |
1224 } | 1227 } |
OLD | NEW |