зеркало из https://github.com/electron/electron.git
GetBlockingPool has been removed
This commit is contained in:
Родитель
0291dc8214
Коммит
021e383418
|
@ -27,8 +27,8 @@
|
||||||
#include "base/path_service.h"
|
#include "base/path_service.h"
|
||||||
#include "base/strings/string_util.h"
|
#include "base/strings/string_util.h"
|
||||||
#include "base/strings/stringprintf.h"
|
#include "base/strings/stringprintf.h"
|
||||||
|
#include "base/task_scheduler/post_task.h"
|
||||||
#include "base/threading/sequenced_worker_pool.h"
|
#include "base/threading/sequenced_worker_pool.h"
|
||||||
#include "base/threading/worker_pool.h"
|
|
||||||
#include "chrome/common/chrome_paths.h"
|
#include "chrome/common/chrome_paths.h"
|
||||||
#include "chrome/common/pref_names.h"
|
#include "chrome/common/pref_names.h"
|
||||||
#include "components/prefs/pref_registry_simple.h"
|
#include "components/prefs/pref_registry_simple.h"
|
||||||
|
@ -136,8 +136,9 @@ AtomBrowserContext::CreateURLRequestJobFactory(
|
||||||
url::kDataScheme, base::WrapUnique(new net::DataProtocolHandler));
|
url::kDataScheme, base::WrapUnique(new net::DataProtocolHandler));
|
||||||
job_factory->SetProtocolHandler(
|
job_factory->SetProtocolHandler(
|
||||||
url::kFileScheme, base::WrapUnique(new asar::AsarProtocolHandler(
|
url::kFileScheme, base::WrapUnique(new asar::AsarProtocolHandler(
|
||||||
BrowserThread::GetBlockingPool()->GetTaskRunnerWithShutdownBehavior(
|
base::CreateSequencedTaskRunnerWithTraits(
|
||||||
base::SequencedWorkerPool::SKIP_ON_SHUTDOWN))));
|
{base::MayBlock(),
|
||||||
|
base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN}))));
|
||||||
job_factory->SetProtocolHandler(
|
job_factory->SetProtocolHandler(
|
||||||
url::kHttpScheme,
|
url::kHttpScheme,
|
||||||
base::WrapUnique(new HttpProtocolHandler(url::kHttpScheme)));
|
base::WrapUnique(new HttpProtocolHandler(url::kHttpScheme)));
|
||||||
|
|
|
@ -7,6 +7,7 @@
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
#include "atom/common/atom_constants.h"
|
#include "atom/common/atom_constants.h"
|
||||||
|
#include "base/task_scheduler/post_task.h"
|
||||||
#include "base/threading/sequenced_worker_pool.h"
|
#include "base/threading/sequenced_worker_pool.h"
|
||||||
|
|
||||||
namespace atom {
|
namespace atom {
|
||||||
|
@ -31,9 +32,8 @@ void URLRequestAsyncAsarJob::StartAsync(std::unique_ptr<base::Value> options) {
|
||||||
net::URLRequestStatus::FAILED, net::ERR_NOT_IMPLEMENTED));
|
net::URLRequestStatus::FAILED, net::ERR_NOT_IMPLEMENTED));
|
||||||
} else {
|
} else {
|
||||||
asar::URLRequestAsarJob::Initialize(
|
asar::URLRequestAsarJob::Initialize(
|
||||||
content::BrowserThread::GetBlockingPool()->
|
base::CreateSequencedTaskRunnerWithTraits(
|
||||||
GetTaskRunnerWithShutdownBehavior(
|
{base::MayBlock(), base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN}),
|
||||||
base::SequencedWorkerPool::SKIP_ON_SHUTDOWN),
|
|
||||||
base::FilePath(file_path));
|
base::FilePath(file_path));
|
||||||
asar::URLRequestAsarJob::Start();
|
asar::URLRequestAsarJob::Start();
|
||||||
}
|
}
|
||||||
|
|
Загрузка…
Ссылка в новой задаче