| 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 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 78 #if defined(OS_CHROMEOS) | 78 #if defined(OS_CHROMEOS) |
| 79 #include "chrome/browser/chromeos/login/users/user.h" | 79 #include "chrome/browser/chromeos/login/users/user.h" |
| 80 #include "chrome/browser/chromeos/login/users/user_manager.h" | 80 #include "chrome/browser/chromeos/login/users/user_manager.h" |
| 81 #include "chrome/browser/chromeos/profiles/profile_helper.h" | 81 #include "chrome/browser/chromeos/profiles/profile_helper.h" |
| 82 #include "chromeos/attestation/attestation_constants.h" | 82 #include "chromeos/attestation/attestation_constants.h" |
| 83 #include "chromeos/dbus/cryptohome_client.h" | 83 #include "chromeos/dbus/cryptohome_client.h" |
| 84 #include "chromeos/dbus/dbus_thread_manager.h" | 84 #include "chromeos/dbus/dbus_thread_manager.h" |
| 85 #endif | 85 #endif |
| 86 | 86 |
| 87 #if defined(ENABLE_EXTENSIONS) | 87 #if defined(ENABLE_EXTENSIONS) |
| 88 #include "chrome/browser/apps/ephemeral_app_service.h" |
| 88 #include "chrome/browser/extensions/activity_log/activity_log.h" | 89 #include "chrome/browser/extensions/activity_log/activity_log.h" |
| 89 #endif | 90 #endif |
| 90 | 91 |
| 91 #if defined(ENABLE_WEBRTC) | 92 #if defined(ENABLE_WEBRTC) |
| 92 #include "chrome/browser/media/webrtc_log_list.h" | 93 #include "chrome/browser/media/webrtc_log_list.h" |
| 93 #include "chrome/browser/media/webrtc_log_util.h" | 94 #include "chrome/browser/media/webrtc_log_util.h" |
| 94 #endif | 95 #endif |
| 95 | 96 |
| 96 using base::UserMetricsAction; | 97 using base::UserMetricsAction; |
| 97 using content::BrowserContext; | 98 using content::BrowserContext; |
| (...skipping 499 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 597 prerender::PrerenderManager::CLEAR_PRERENDER_CONTENTS); | 598 prerender::PrerenderManager::CLEAR_PRERENDER_CONTENTS); |
| 598 } | 599 } |
| 599 | 600 |
| 600 // Tell the shader disk cache to clear. | 601 // Tell the shader disk cache to clear. |
| 601 content::RecordAction(UserMetricsAction("ClearBrowsingData_ShaderCache")); | 602 content::RecordAction(UserMetricsAction("ClearBrowsingData_ShaderCache")); |
| 602 storage_partition_remove_mask |= | 603 storage_partition_remove_mask |= |
| 603 content::StoragePartition::REMOVE_DATA_MASK_SHADER_CACHE; | 604 content::StoragePartition::REMOVE_DATA_MASK_SHADER_CACHE; |
| 604 | 605 |
| 605 storage_partition_remove_mask |= | 606 storage_partition_remove_mask |= |
| 606 content::StoragePartition::REMOVE_DATA_MASK_WEBRTC_IDENTITY; | 607 content::StoragePartition::REMOVE_DATA_MASK_WEBRTC_IDENTITY; |
| 608 |
| 609 #if defined(ENABLE_EXTENSIONS) |
| 610 // Clear the ephemeral apps cache. |
| 611 EphemeralAppService::Get(profile_)->ClearCachedApps(); |
| 612 #endif |
| 607 } | 613 } |
| 608 | 614 |
| 609 if (storage_partition_remove_mask) { | 615 if (storage_partition_remove_mask) { |
| 610 waiting_for_clear_storage_partition_data_ = true; | 616 waiting_for_clear_storage_partition_data_ = true; |
| 611 | 617 |
| 612 content::StoragePartition* storage_partition; | 618 content::StoragePartition* storage_partition; |
| 613 if (storage_partition_for_testing_) | 619 if (storage_partition_for_testing_) |
| 614 storage_partition = storage_partition_for_testing_; | 620 storage_partition = storage_partition_for_testing_; |
| 615 else | 621 else |
| 616 storage_partition = BrowserContext::GetDefaultStoragePartition(profile_); | 622 storage_partition = BrowserContext::GetDefaultStoragePartition(profile_); |
| (...skipping 549 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1166 waiting_for_clear_webrtc_logs_ = false; | 1172 waiting_for_clear_webrtc_logs_ = false; |
| 1167 NotifyAndDeleteIfDone(); | 1173 NotifyAndDeleteIfDone(); |
| 1168 } | 1174 } |
| 1169 #endif | 1175 #endif |
| 1170 | 1176 |
| 1171 void BrowsingDataRemover::OnClearedDomainReliabilityMonitor() { | 1177 void BrowsingDataRemover::OnClearedDomainReliabilityMonitor() { |
| 1172 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 1178 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
| 1173 waiting_for_clear_domain_reliability_monitor_ = false; | 1179 waiting_for_clear_domain_reliability_monitor_ = false; |
| 1174 NotifyAndDeleteIfDone(); | 1180 NotifyAndDeleteIfDone(); |
| 1175 } | 1181 } |
| OLD | NEW |