| 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/pepper_flash_settings_manager.h" | 5 #include "chrome/browser/pepper_flash_settings_manager.h" |
| 6 | 6 |
| 7 #include <map> | 7 #include <map> |
| 8 #include <utility> | 8 #include <utility> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 443 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 454 // TODO(raymes): This is temporary code to migrate ChromeOS devices to the new | 454 // TODO(raymes): This is temporary code to migrate ChromeOS devices to the new |
| 455 // scheme for generating device IDs. Delete this once we are sure most ChromeOS | 455 // scheme for generating device IDs. Delete this once we are sure most ChromeOS |
| 456 // devices have been migrated. | 456 // devices have been migrated. |
| 457 void PepperFlashSettingsManager::Core::DeauthorizeContentLicensesOnBlockingPool( | 457 void PepperFlashSettingsManager::Core::DeauthorizeContentLicensesOnBlockingPool( |
| 458 uint32 request_id, | 458 uint32 request_id, |
| 459 const base::FilePath& profile_path) { | 459 const base::FilePath& profile_path) { |
| 460 // ChromeOS used to store the device ID in a file but this is no longer used. | 460 // ChromeOS used to store the device ID in a file but this is no longer used. |
| 461 // Wipe that file. | 461 // Wipe that file. |
| 462 const base::FilePath& device_id_path = | 462 const base::FilePath& device_id_path = |
| 463 chrome::DeviceIDFetcher::GetLegacyDeviceIDPath(profile_path); | 463 chrome::DeviceIDFetcher::GetLegacyDeviceIDPath(profile_path); |
| 464 bool success = base::Delete(device_id_path, false); | 464 bool success = base::DeleteFile(device_id_path, false); |
| 465 | 465 |
| 466 BrowserThread::PostTask( | 466 BrowserThread::PostTask( |
| 467 BrowserThread::IO, FROM_HERE, | 467 BrowserThread::IO, FROM_HERE, |
| 468 base::Bind(&Core::DeauthorizeContentLicensesInPlugin, this, request_id, | 468 base::Bind(&Core::DeauthorizeContentLicensesInPlugin, this, request_id, |
| 469 success)); | 469 success)); |
| 470 } | 470 } |
| 471 | 471 |
| 472 void PepperFlashSettingsManager::Core::DeauthorizeContentLicensesInPlugin( | 472 void PepperFlashSettingsManager::Core::DeauthorizeContentLicensesInPlugin( |
| 473 uint32 request_id, | 473 uint32 request_id, |
| 474 bool success) { | 474 bool success) { |
| (...skipping 588 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1063 } | 1063 } |
| 1064 | 1064 |
| 1065 void PepperFlashSettingsManager::OnError(Core* core) { | 1065 void PepperFlashSettingsManager::OnError(Core* core) { |
| 1066 DCHECK(core); | 1066 DCHECK(core); |
| 1067 if (core != core_.get()) | 1067 if (core != core_.get()) |
| 1068 return; | 1068 return; |
| 1069 | 1069 |
| 1070 core_->Detach(); | 1070 core_->Detach(); |
| 1071 core_ = NULL; | 1071 core_ = NULL; |
| 1072 } | 1072 } |
| OLD | NEW |