From 4242f2e65493349af091c0f588182493090dbed2 Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Wed, 29 Apr 2020 09:05:41 +0200 Subject: Reuse switch from service_manager Change-Id: I71b38064f8ef743440b4542add5d329df5843627 Reviewed-by: Allan Sandfeld Jensen --- src/core/content_client_qt.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/core') diff --git a/src/core/content_client_qt.cpp b/src/core/content_client_qt.cpp index 80eb9ceb1..083e10f2a 100644 --- a/src/core/content_client_qt.cpp +++ b/src/core/content_client_qt.cpp @@ -54,7 +54,7 @@ #include "ui/base/layout.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" - +#include "services/service_manager/embedder/switches.h" #include "type_conversion.h" #include @@ -68,9 +68,7 @@ #include "third_party/widevine/cdm/widevine_cdm_common.h" #if BUILDFLAG(ENABLE_WIDEVINE) && !BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT) #define WIDEVINE_CDM_AVAILABLE_NOT_COMPONENT -namespace switches { -const char kCdmWidevinePath[] = "widevine-path"; -} + // File name of the CDM on different platforms. const char kWidevineCdmFileName[] = #if defined(OS_MACOSX) @@ -287,7 +285,7 @@ static bool IsWidevineAvailable(base::FilePath *cdm_path, content::CdmCapability *capability) { QStringList pluginPaths; - const base::CommandLine::StringType widevine_argument = base::CommandLine::ForCurrentProcess()->GetSwitchValueNative(switches::kCdmWidevinePath); + const base::CommandLine::StringType widevine_argument = base::CommandLine::ForCurrentProcess()->GetSwitchValueNative(service_manager::switches::kCdmWidevinePath); if (!widevine_argument.empty()) pluginPaths << QtWebEngineCore::toQt(widevine_argument); else { -- cgit v1.2.3