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/content_main_delegate_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/content_main_delegate_qt.cpp')
| -rw-r--r-- | src/core/content_main_delegate_qt.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/content_main_delegate_qt.cpp b/src/core/content_main_delegate_qt.cpp index 3989170a0..d9ddf3f49 100644 --- a/src/core/content_main_delegate_qt.cpp +++ b/src/core/content_main_delegate_qt.cpp @@ -53,6 +53,7 @@ #include <ui/base/webui/jstemplate_builder.h> #include "net/grit/net_resources.h" #include "net/base/net_module.h" +#include "services/service_manager/sandbox/switches.h" #include "url/url_util_qt.h" #include "content_client_qt.h" @@ -171,7 +172,7 @@ content::ContentRendererClient *ContentMainDelegateQt::CreateContentRendererClie #if defined(OS_LINUX) base::CommandLine *parsedCommandLine = base::CommandLine::ForCurrentProcess(); std::string process_type = parsedCommandLine->GetSwitchValueASCII(switches::kProcessType); - bool no_sandbox = parsedCommandLine->HasSwitch(switches::kNoSandbox); + bool no_sandbox = parsedCommandLine->HasSwitch(service_manager::switches::kNoSandbox); // Reload locale if the renderer process is sandboxed if (process_type == switches::kRendererProcess && !no_sandbox) { @@ -196,7 +197,7 @@ static void SafeOverridePathImpl(const char *keyName, int key, const base::FileP return; // Do not create directories for overridden paths. - if (PathService::OverrideAndCreateIfNeeded(key, path, false, false)) + if (base::PathService::OverrideAndCreateIfNeeded(key, path, false, false)) return; qWarning("Path override failed for key %s and path '%s'", keyName, path.value().c_str()); |