summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Klocek <michal.klocek@qt.io>2022-04-06 15:46:44 +0200
committerMichal Klocek <michal.klocek@qt.io>2022-05-24 16:03:52 +0000
commit26cc548e8f080956c80f4ed60a79ed02cc5d1a97 (patch)
tree93fc53691d99058f9b8b4e490a557fd5dc3fb382
parentf3f01abde8cf17d21a00aef0292a27a0d4ada914 (diff)
downloadqtwebengine-chromium-26cc548e8f080956c80f4ed60a79ed02cc5d1a97.tar.gz
Minor. Use FilePath directly for qt sandbox path
Change-Id: I27da11d1b47b13c2dec7093ea573b9afc1d8505d Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 599a6221a4b3e74c09a5e0d2889b02d88ff16d45)
-rw-r--r--chromium/content/browser/sandbox_parameters_mac.mm7
1 files changed, 3 insertions, 4 deletions
diff --git a/chromium/content/browser/sandbox_parameters_mac.mm b/chromium/content/browser/sandbox_parameters_mac.mm
index 62fa904a3b2..fbb6f9ca3a3 100644
--- a/chromium/content/browser/sandbox_parameters_mac.mm
+++ b/chromium/content/browser/sandbox_parameters_mac.mm
@@ -39,7 +39,7 @@
namespace content {
#if defined(TOOLKIT_QT)
-std::string getQtPrefix();
+base::FilePath getSandboxPath();
#endif
namespace {
@@ -132,9 +132,8 @@ void SetupCommonSandboxParameters(sandbox::SeatbeltExecClient* client) {
CHECK(client->SetParameter(sandbox::policy::kParamOsVersion, GetOSVersion()));
#if defined(TOOLKIT_QT)
- // Allow read access to files under the Qt Prefix.
- const std::string qt_prefix_path_string = getQtPrefix();
- const base::FilePath qt_prefix_path = base::FilePath(qt_prefix_path_string);
+ // Allow read access to files under the Qt path.
+ const base::FilePath qt_prefix_path = getSandboxPath();
const std::string qt_prefix_path_canonical =
sandbox::policy::GetCanonicalPath(qt_prefix_path).value();
CHECK(client->SetParameter(sandbox::policy::kParamQtPrefixPath,