Commit e478d0e0 authored by Joel Hockey's avatar Joel Hockey Committed by Commit Bot

Share crostini persisted paths in OnStartTerminaVm

Currently SharePersistedPaths is getting called on every invocation
of RestartCrostini. This change will mean that shares are only done
the first time the VM starts.

Bug: 878324
Change-Id: I72c0c750de71ed9a2d3f3dd91d21fd6991f1eef4
Reviewed-on: https://chromium-review.googlesource.com/c/1297773Reviewed-by: default avatarNicholas Verne <nverne@chromium.org>
Commit-Queue: Joel Hockey <joelhockey@chromium.org>
Cr-Commit-Position: refs/heads/master@{#602540}
parent 18d189dd
...@@ -362,18 +362,6 @@ class CrostiniManager::CrostiniRestarter ...@@ -362,18 +362,6 @@ class CrostiniManager::CrostiniRestarter
if (is_aborted_) if (is_aborted_)
return; return;
// Share folders from Downloads, etc with container.
// TODO(joelhockey): SharePersistedPaths is getting called on every Restart,
// even if the VM is already running. Only call SharePersistedPaths when
// VM starts for the first time.
SharePersistedPaths(
profile_,
base::BindOnce(&CrostiniRestarter::OnPersistedPathsShared, this));
}
void OnPersistedPathsShared(bool success, std::string failure_reason) {
// Sharing paths is not critical, FinishRestart(SUCCESS) regardless.
// Errors will be logged.
FinishRestart(CrostiniResult::SUCCESS); FinishRestart(CrostiniResult::SUCCESS);
} }
...@@ -1295,6 +1283,11 @@ void CrostiniManager::OnStartTerminaVm( ...@@ -1295,6 +1283,11 @@ void CrostiniManager::OnStartTerminaVm(
vm_name, base::BindOnce(&CrostiniManager::OnStartTremplin, vm_name, base::BindOnce(&CrostiniManager::OnStartTremplin,
weak_ptr_factory_.GetWeakPtr(), vm_name, weak_ptr_factory_.GetWeakPtr(), vm_name,
std::move(callback), CrostiniResult::SUCCESS)); std::move(callback), CrostiniResult::SUCCESS));
// Share folders from Downloads, etc with default VM.
if (vm_name == kCrostiniDefaultVmName) {
SharePersistedPaths(profile_, base::DoNothing());
}
} }
void CrostiniManager::OnStartTremplin(std::string vm_name, void CrostiniManager::OnStartTremplin(std::string vm_name,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment