diff options
| author | Peter Varga <pvarga@inf.u-szeged.hu> | 2022-11-16 16:28:51 +0100 |
|---|---|---|
| committer | Peter Varga <pvarga@inf.u-szeged.hu> | 2022-11-17 07:38:04 +0000 |
| commit | 39fd2bcabcfe3310a8bdcbab448afb9a941ca6e2 (patch) | |
| tree | 83ff95a0e4b8ccd0b4d4e6af08c2c67f0b9cb989 | |
| parent | ea0ae8ba78fbf141584378b82e0f6a9cda7d06e9 (diff) | |
| download | qtwebengine-chromium-39fd2bcabcfe3310a8bdcbab448afb9a941ca6e2.tar.gz | |
Fix building with enable_screen_ai_service=false
Change-Id: I45fe93f738eb889ecf621ce4383f88afc03d259c
Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/443760
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| -rw-r--r-- | chromium/content/browser/sandbox_parameters_mac.mm | 3 | ||||
| -rw-r--r-- | chromium/sandbox/policy/mac/sandbox_mac.mm | 5 |
2 files changed, 8 insertions, 0 deletions
diff --git a/chromium/content/browser/sandbox_parameters_mac.mm b/chromium/content/browser/sandbox_parameters_mac.mm index 1a34adf97e2..987aa03fe5d 100644 --- a/chromium/content/browser/sandbox_parameters_mac.mm +++ b/chromium/content/browser/sandbox_parameters_mac.mm @@ -23,6 +23,7 @@ #include "content/public/common/content_client.h" #include "content/public/common/content_features.h" #include "content/public/common/content_switches.h" +#include "components/services/screen_ai/buildflags/buildflags.h #include "ppapi/buildflags/buildflags.h" #include "printing/buildflags/buildflags.h" #include "sandbox/mac/seatbelt_exec.h" @@ -253,7 +254,9 @@ void SetupSandboxParameters(sandbox::mojom::Sandbox sandbox_type, << static_cast<int>(sandbox_type); break; // Setup parameters for sandbox types handled by embedders below. +#if BUILDFLAG(ENABLE_SCREEN_AI_SERVICE) case sandbox::mojom::Sandbox::kScreenAI: +#endif case sandbox::mojom::Sandbox::kSpeechRecognition: SetupCommonSandboxParameters(client); CHECK(GetContentClient()->browser()->SetupEmbedderSandboxParameters( diff --git a/chromium/sandbox/policy/mac/sandbox_mac.mm b/chromium/sandbox/policy/mac/sandbox_mac.mm index 48c43f95bb4..2541b9c7d52 100644 --- a/chromium/sandbox/policy/mac/sandbox_mac.mm +++ b/chromium/sandbox/policy/mac/sandbox_mac.mm @@ -12,6 +12,7 @@ #include "base/files/scoped_file.h" #include "base/logging.h" #include "base/posix/eintr_wrapper.h" +#include "components/services/screen_ai/buildflags/buildflags.h" #include "ppapi/buildflags/buildflags.h" #include "printing/buildflags/buildflags.h" #include "sandbox/policy/mac/audio.sb.h" @@ -27,7 +28,9 @@ #endif #include "sandbox/policy/mac/print_compositor.sb.h" #include "sandbox/policy/mac/renderer.sb.h" +#if BUILDFLAG(ENABLE_SCREEN_AI_SERVICE) #include "sandbox/policy/mac/screen_ai.sb.h" +#endif #include "sandbox/policy/mac/speech_recognition.sb.h" #include "sandbox/policy/mac/utility.sb.h" #include "sandbox/policy/mojom/sandbox.mojom.h" @@ -86,9 +89,11 @@ std::string GetSandboxProfile(sandbox::mojom::Sandbox sandbox_type) { case sandbox::mojom::Sandbox::kPrintCompositor: profile += kSeatbeltPolicyString_print_compositor; break; +#if BUILDFLAG(ENABLE_SCREEN_AI_SERVICE) case sandbox::mojom::Sandbox::kScreenAI: profile += kSeatbeltPolicyString_screen_ai; break; +#endif case sandbox::mojom::Sandbox::kSpeechRecognition: profile += kSeatbeltPolicyString_speech_recognition; break; |