| Index: ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc
|
| diff --git a/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc b/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc
|
| index 3ceea8f4cacb4896cefc35e031707e75dcfdcd4e..e22468a10f886eccc8c92530c65371d3ced0e970 100644
|
| --- a/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc
|
| +++ b/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc
|
| @@ -16,8 +16,8 @@
|
| #include "base/memory/free_deleter.h"
|
| #include "base/single_thread_task_runner.h"
|
| #include "base/task_runner.h"
|
| +#include "base/task_scheduler/post_task.h"
|
| #include "base/threading/thread_task_runner_handle.h"
|
| -#include "base/threading/worker_pool.h"
|
| #include "build/build_config.h"
|
| #include "ui/events/event_constants.h"
|
| #include "ui/events/keycodes/dom/dom_code.h"
|
| @@ -685,11 +685,13 @@ bool XkbKeyboardLayoutEngine::SetCurrentLayoutByName(
|
| }
|
| LoadKeymapCallback reply_callback = base::Bind(
|
| &XkbKeyboardLayoutEngine::OnKeymapLoaded, weak_ptr_factory_.GetWeakPtr());
|
| - base::WorkerPool::PostTask(
|
| - FROM_HERE,
|
| + base::PostTaskWithTraits(
|
| + FROM_HERE, base::TaskTraits()
|
| + .WithShutdownBehavior(
|
| + base::TaskShutdownBehavior::CONTINUE_ON_SHUTDOWN)
|
| + .MayBlock(),
|
| base::Bind(&LoadKeymap, layout_name, base::ThreadTaskRunnerHandle::Get(),
|
| - reply_callback),
|
| - true);
|
| + reply_callback));
|
| return true;
|
| #else
|
| // Required by ozone-wayland (at least) for non ChromeOS builds. See
|
|
|