| 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 684 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 695 | 695 |
| 696 waiting_for_clear_content_licenses_ = true; | 696 waiting_for_clear_content_licenses_ = true; |
| 697 if (!pepper_flash_settings_manager_.get()) { | 697 if (!pepper_flash_settings_manager_.get()) { |
| 698 pepper_flash_settings_manager_.reset( | 698 pepper_flash_settings_manager_.reset( |
| 699 new PepperFlashSettingsManager(this, profile_)); | 699 new PepperFlashSettingsManager(this, profile_)); |
| 700 } | 700 } |
| 701 deauthorize_content_licenses_request_id_ = | 701 deauthorize_content_licenses_request_id_ = |
| 702 pepper_flash_settings_manager_->DeauthorizeContentLicenses(prefs); | 702 pepper_flash_settings_manager_->DeauthorizeContentLicenses(prefs); |
| 703 #if defined(OS_CHROMEOS) | 703 #if defined(OS_CHROMEOS) |
| 704 // On Chrome OS, also delete any content protection platform keys. | 704 // On Chrome OS, also delete any content protection platform keys. |
| 705 user_manager::User* user = | 705 const user_manager::User* user = |
| 706 chromeos::ProfileHelper::Get()->GetUserByProfile(profile_); | 706 chromeos::ProfileHelper::Get()->GetUserByProfile(profile_); |
| 707 if (!user) { | 707 if (!user) { |
| 708 LOG(WARNING) << "Failed to find user for current profile."; | 708 LOG(WARNING) << "Failed to find user for current profile."; |
| 709 } else { | 709 } else { |
| 710 chromeos::DBusThreadManager::Get()->GetCryptohomeClient()-> | 710 chromeos::DBusThreadManager::Get()->GetCryptohomeClient()-> |
| 711 TpmAttestationDeleteKeys( | 711 TpmAttestationDeleteKeys( |
| 712 chromeos::attestation::KEY_USER, | 712 chromeos::attestation::KEY_USER, |
| 713 user->email(), | 713 user->email(), |
| 714 chromeos::attestation::kContentProtectionKeyPrefix, | 714 chromeos::attestation::kContentProtectionKeyPrefix, |
| 715 base::Bind(&BrowsingDataRemover::OnClearPlatformKeys, | 715 base::Bind(&BrowsingDataRemover::OnClearPlatformKeys, |
| (...skipping 508 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1224 waiting_for_clear_domain_reliability_monitor_ = false; | 1224 waiting_for_clear_domain_reliability_monitor_ = false; |
| 1225 NotifyAndDeleteIfDone(); | 1225 NotifyAndDeleteIfDone(); |
| 1226 } | 1226 } |
| 1227 | 1227 |
| 1228 // static | 1228 // static |
| 1229 BrowsingDataRemover::CallbackSubscription | 1229 BrowsingDataRemover::CallbackSubscription |
| 1230 BrowsingDataRemover::RegisterOnBrowsingDataRemovedCallback( | 1230 BrowsingDataRemover::RegisterOnBrowsingDataRemovedCallback( |
| 1231 const BrowsingDataRemover::Callback& callback) { | 1231 const BrowsingDataRemover::Callback& callback) { |
| 1232 return GetOnBrowsingDataRemovedCallbacks()->Add(callback); | 1232 return GetOnBrowsingDataRemovedCallbacks()->Add(callback); |
| 1233 } | 1233 } |
| OLD | NEW |