diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-08-23 18:26:28 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-09-22 08:47:19 +0000 |
commit | c0419ae89fbc4fbdc58aef5b8b01ab0b45f8ff98 (patch) | |
tree | d0bdc1f0ef144bb63ed75b8e6fcfb6f039628210 /src/core/resource_bundle_qt.cpp | |
parent | 1e89fa4226be870d97d3b21c6c7087886c81bbc5 (diff) |
Adaptations for Chromium 68
Together-with: Tamas Zakor<ztamas@inf.u-szeged.hu>
Change-Id: I805246b6f01cb151fff48588744408c676d87c14
Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'src/core/resource_bundle_qt.cpp')
-rw-r--r-- | src/core/resource_bundle_qt.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/resource_bundle_qt.cpp b/src/core/resource_bundle_qt.cpp index c37854ea6..428faa34e 100644 --- a/src/core/resource_bundle_qt.cpp +++ b/src/core/resource_bundle_qt.cpp @@ -40,6 +40,7 @@ #include "base/command_line.h" #include "base/metrics/histogram_macros.h" #include "content/public/common/content_switches.h" +#include "services/service_manager/sandbox/switches.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/data_pack.h" #include "ui/base/resource/resource_bundle.h" @@ -75,7 +76,7 @@ bool ResourceBundle::LocaleDataPakExists(const std::string& locale) #if defined(OS_LINUX) base::CommandLine *parsed_command_line = base::CommandLine::ForCurrentProcess(); std::string process_type = parsed_command_line->GetSwitchValueASCII(switches::kProcessType); - bool no_sandbox = parsed_command_line->HasSwitch(switches::kNoSandbox); + bool no_sandbox = parsed_command_line->HasSwitch(service_manager::switches::kNoSandbox); if (process_type == switches::kRendererProcess && !no_sandbox) { // The Renderer Process is sandboxed thus only one locale is available in it. // The particular one is passed by the --lang command line option. |