summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
m---------src/3rdparty0
-rw-r--r--src/core/content_main_delegate_qt.cpp9
-rw-r--r--src/core/web_engine_context.cpp2
3 files changed, 11 insertions, 0 deletions
diff --git a/src/3rdparty b/src/3rdparty
-Subproject 15a42873b9a4bda657e7a435f25241a05b8bd1c
+Subproject 87e5a52b8860fc35e59e308a3468b015ba4c19e
diff --git a/src/core/content_main_delegate_qt.cpp b/src/core/content_main_delegate_qt.cpp
index f93a3c0ea..30bac71af 100644
--- a/src/core/content_main_delegate_qt.cpp
+++ b/src/core/content_main_delegate_qt.cpp
@@ -69,6 +69,7 @@
#endif
#if defined(OS_LINUX)
+#include "media/audio/audio_manager.h"
#include "ui/base/ui_base_switches.h"
#endif
@@ -220,6 +221,14 @@ void ContentMainDelegateQt::PreSandboxStartup()
media::InitializeVideoToolbox();
}
#endif
+
+ if (parsedCommandLine->HasSwitch(service_manager::switches::kApplicationName)) {
+ const std::string appName = parsedCommandLine->GetSwitchValueASCII(service_manager::switches::kApplicationName);
+ QCoreApplication::setApplicationName(QString::fromStdString(appName));
+#if defined(OS_LINUX)
+ media::AudioManager::SetGlobalAppName(appName);
+#endif
+ }
}
content::ContentBrowserClient *ContentMainDelegateQt::CreateContentBrowserClient()
diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp
index 1399c0fdc..01d55a5a1 100644
--- a/src/core/web_engine_context.cpp
+++ b/src/core/web_engine_context.cpp
@@ -568,6 +568,8 @@ WebEngineContext::WebEngineContext()
setupProxyPac(parsedCommandLine);
parsedCommandLine->AppendSwitchPath(switches::kBrowserSubprocessPath, WebEngineLibraryInfo::getPath(content::CHILD_PROCESS_EXE));
+ parsedCommandLine->AppendSwitchASCII(service_manager::switches::kApplicationName, QCoreApplication::applicationName().toStdString());
+
// Enable sandboxing on OS X and Linux (Desktop / Embedded) by default.
bool disable_sandbox = qEnvironmentVariableIsSet(kDisableSandboxEnv);
if (!disable_sandbox) {