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 423 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
434 | 434 |
435 pending_responses_.insert( | 435 pending_responses_.insert( |
436 std::make_pair(request_id, DEAUTHORIZE_CONTENT_LICENSES)); | 436 std::make_pair(request_id, DEAUTHORIZE_CONTENT_LICENSES)); |
437 if (state_ == STATE_ERROR) { | 437 if (state_ == STATE_ERROR) { |
438 NotifyErrorFromIOThread(); | 438 NotifyErrorFromIOThread(); |
439 return; | 439 return; |
440 } | 440 } |
441 | 441 |
442 #if defined(OS_CHROMEOS) | 442 #if defined(OS_CHROMEOS) |
443 base::PostTaskWithTraits(FROM_HERE, | 443 base::PostTaskWithTraits(FROM_HERE, |
444 base::TaskTraits().MayBlock().WithPriority( | 444 {base::MayBlock(), base::TaskPriority::BACKGROUND}, |
445 base::TaskPriority::BACKGROUND), | |
446 base::Bind(&Core::DeauthorizeContentLicensesAsync, | 445 base::Bind(&Core::DeauthorizeContentLicensesAsync, |
447 this, request_id, browser_context_path_)); | 446 this, request_id, browser_context_path_)); |
448 #else | 447 #else |
449 DeauthorizeContentLicensesInPlugin(request_id, true); | 448 DeauthorizeContentLicensesInPlugin(request_id, true); |
450 #endif | 449 #endif |
451 } | 450 } |
452 | 451 |
453 // TODO(raymes): This is temporary code to migrate ChromeOS devices to the new | 452 // TODO(raymes): This is temporary code to migrate ChromeOS devices to the new |
454 // scheme for generating device IDs. Delete this once we are sure most ChromeOS | 453 // scheme for generating device IDs. Delete this once we are sure most ChromeOS |
455 // devices have been migrated. | 454 // devices have been migrated. |
(...skipping 596 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1052 } | 1051 } |
1053 | 1052 |
1054 void PepperFlashSettingsManager::OnError(Core* core) { | 1053 void PepperFlashSettingsManager::OnError(Core* core) { |
1055 DCHECK(core); | 1054 DCHECK(core); |
1056 if (core != core_.get()) | 1055 if (core != core_.get()) |
1057 return; | 1056 return; |
1058 | 1057 |
1059 core_->Detach(); | 1058 core_->Detach(); |
1060 core_ = NULL; | 1059 core_ = NULL; |
1061 } | 1060 } |
OLD | NEW |