diff options
Diffstat (limited to 'chromium/chrome/browser/extensions/api/terminal')
| -rw-r--r-- | chromium/chrome/browser/extensions/api/terminal/crostini_startup_status.cc | 5 | ||||
| -rw-r--r-- | chromium/chrome/browser/extensions/api/terminal/terminal_private_api.cc | 33 |
2 files changed, 17 insertions, 21 deletions
diff --git a/chromium/chrome/browser/extensions/api/terminal/crostini_startup_status.cc b/chromium/chrome/browser/extensions/api/terminal/crostini_startup_status.cc index e7d31651cd9..46b9d08c181 100644 --- a/chromium/chrome/browser/extensions/api/terminal/crostini_startup_status.cc +++ b/chromium/chrome/browser/extensions/api/terminal/crostini_startup_status.cc @@ -12,7 +12,6 @@ #include "base/strings/strcat.h" #include "base/strings/stringprintf.h" #include "base/system/sys_info.h" -#include "base/task/post_task.h" #include "base/time/time.h" #include "chrome/grit/generated_resources.h" #include "chromeos/dbus/util/version_loader.h" @@ -79,8 +78,8 @@ void CrostiniStartupStatus::ShowProgressAtInterval() { PrintProgress(); } ++spinner_index_; - base::PostDelayedTask( - FROM_HERE, {content::BrowserThread::UI}, + content::GetUIThreadTaskRunner({})->PostDelayedTask( + FROM_HERE, base::BindOnce(&CrostiniStartupStatus::ShowProgressAtInterval, weak_factory_.GetWeakPtr()), base::TimeDelta::FromMilliseconds(300)); diff --git a/chromium/chrome/browser/extensions/api/terminal/terminal_private_api.cc b/chromium/chrome/browser/extensions/api/terminal/terminal_private_api.cc index f17fccee02c..e2d7220cd38 100644 --- a/chromium/chrome/browser/extensions/api/terminal/terminal_private_api.cc +++ b/chromium/chrome/browser/extensions/api/terminal/terminal_private_api.cc @@ -17,7 +17,6 @@ #include "base/memory/scoped_refptr.h" #include "base/strings/stringprintf.h" #include "base/system/sys_info.h" -#include "base/task/post_task.h" #include "base/values.h" #include "chrome/browser/chromeos/crostini/crostini_features.h" #include "chrome/browser/chromeos/crostini/crostini_manager.h" @@ -93,8 +92,8 @@ void NotifyProcessOutput(content::BrowserContext* browser_context, const std::string& output_type, const std::string& output) { if (!content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)) { - base::PostTask(FROM_HERE, {content::BrowserThread::UI}, - base::BindOnce(&NotifyProcessOutput, browser_context, tab_id, + content::GetUIThreadTaskRunner({})->PostTask( + FROM_HERE, base::BindOnce(&NotifyProcessOutput, browser_context, tab_id, terminal_id, output_type, output)); return; } @@ -249,12 +248,10 @@ TerminalPrivateOpenTerminalProcessFunction::OpenProcess( GetSwitch(¶ms_args, &vmshell_cmd, kSwitchTargetContainer, crostini::kCrostiniDefaultContainerName); std::string startup_id = params_args.GetSwitchValueASCII(kSwitchStartupId); + crostini::ContainerId container_id(vm_name, container_name); auto* mgr = crostini::CrostiniManager::GetForProfile(profile); - bool verbose = - !mgr->GetContainerInfo(crostini::kCrostiniDefaultVmName, - crostini::kCrostiniDefaultContainerName) - .has_value(); + bool verbose = !mgr->GetContainerInfo(container_id).has_value(); auto observer = std::make_unique<CrostiniStartupStatus>( base::BindRepeating(&NotifyProcessOutput, browser_context(), tab_id, startup_id, @@ -265,7 +262,7 @@ TerminalPrivateOpenTerminalProcessFunction::OpenProcess( CrostiniStartupStatus* observer_ptr = observer.get(); observer->ShowProgressAtInterval(); mgr->RestartCrostini( - vm_name, container_name, + container_id, base::BindOnce( &TerminalPrivateOpenTerminalProcessFunction::OnCrostiniRestarted, this, std::move(observer), user_id_hash, tab_id, @@ -331,8 +328,8 @@ void TerminalPrivateOpenTerminalProcessFunction::OpenOnRegistryTaskRunner( bool success = registry->OpenProcess(cmdline, user_id_hash, output_callback, &terminal_id); - base::PostTask(FROM_HERE, {content::BrowserThread::UI}, - base::BindOnce(callback, success, terminal_id)); + content::GetUIThreadTaskRunner({})->PostTask( + FROM_HERE, base::BindOnce(callback, success, terminal_id)); } TerminalPrivateOpenVmshellProcessFunction:: @@ -379,8 +376,8 @@ void TerminalPrivateSendInputFunction::SendInputOnRegistryTaskRunner( bool success = chromeos::ProcessProxyRegistry::Get()->SendInput(terminal_id, text); - base::PostTask( - FROM_HERE, {content::BrowserThread::UI}, + content::GetUIThreadTaskRunner({})->PostTask( + FROM_HERE, base::BindOnce(&TerminalPrivateSendInputFunction::RespondOnUIThread, this, success)); } @@ -412,8 +409,8 @@ void TerminalPrivateCloseTerminalProcessFunction::CloseOnRegistryTaskRunner( bool success = chromeos::ProcessProxyRegistry::Get()->CloseProcess(terminal_id); - base::PostTask( - FROM_HERE, {content::BrowserThread::UI}, + content::GetUIThreadTaskRunner({})->PostTask( + FROM_HERE, base::BindOnce( &TerminalPrivateCloseTerminalProcessFunction::RespondOnUIThread, this, success)); @@ -450,8 +447,8 @@ void TerminalPrivateOnTerminalResizeFunction::OnResizeOnRegistryTaskRunner( bool success = chromeos::ProcessProxyRegistry::Get()->OnTerminalResize( terminal_id, width, height); - base::PostTask( - FROM_HERE, {content::BrowserThread::UI}, + content::GetUIThreadTaskRunner({})->PostTask( + FROM_HERE, base::BindOnce( &TerminalPrivateOnTerminalResizeFunction::RespondOnUIThread, this, success)); @@ -537,8 +534,8 @@ void TerminalPrivateGetCroshSettingsFunction::AsyncRunWithStorage( ExtensionFunction::ResponseValue response = result.status().ok() ? OneArgument(result.PassSettings()) : Error(result.status().message); - base::PostTask( - FROM_HERE, {content::BrowserThread::UI}, + content::GetUIThreadTaskRunner({})->PostTask( + FROM_HERE, base::BindOnce(&TerminalPrivateGetCroshSettingsFunction::Respond, this, std::move(response))); } |