diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-11-06 09:16:15 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-01-13 16:12:06 +0100 |
| commit | c9d902ca6ca3b1aa2e2762329d18c226d26520af (patch) | |
| tree | 199fdd7b3f0d0ad21597fafa086729dc2e75d4e1 /src/core/content_main_delegate_qt.cpp | |
| parent | 7869ec5823da36a3ce33b379d3d664204756cad5 (diff) | |
Adaptations for Chromium 87
Change-Id: Ic4ffd98e02f986dbaf986405360e727c813e696e
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Diffstat (limited to 'src/core/content_main_delegate_qt.cpp')
| -rw-r--r-- | src/core/content_main_delegate_qt.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/content_main_delegate_qt.cpp b/src/core/content_main_delegate_qt.cpp index 9971a4ac5..59d7050a4 100644 --- a/src/core/content_main_delegate_qt.cpp +++ b/src/core/content_main_delegate_qt.cpp @@ -57,7 +57,7 @@ #include "net/grit/net_resources.h" #include "net/base/net_module.h" #include "sandbox/policy/switches.h" -#include "services/service_manager/embedder/switches.h" +#include "services/service_manager/switches.h" #include "url/url_util_qt.h" #include "content_client_qt.h" @@ -83,7 +83,7 @@ #include "media/gpu/windows/media_foundation_video_encode_accelerator_win.h" #endif -#if defined(OS_MACOSX) +#if defined(OS_MAC) #include "content/public/common/content_features.h" #include "media/gpu/mac/vt_video_decode_accelerator_mac.h" #endif @@ -217,7 +217,7 @@ void ContentMainDelegateQt::PreSandboxStartup() media::MediaFoundationVideoEncodeAccelerator::PreSandboxInitialization(); #endif -#if defined(OS_MACOSX) +#if defined(OS_MAC) if (base::FeatureList::IsEnabled(features::kMacV2GPUSandbox)) { TRACE_EVENT0("gpu", "Initialize VideoToolbox"); media::InitializeVideoToolbox(); |