diff options
| author | Rene Ladan <rene@FreeBSD.org> | 2018-02-20 18:51:06 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2018-02-20 18:51:06 +0000 |
| commit | 2312775f8ebc90aa20f4e45bd252816e24314844 (patch) | |
| tree | 34414a0b8d8a904cd0eb4023b41603862897f7c9 /www/chromium/files/patch-media_audio_audio__manager.cc | |
| parent | Update to 0.9704. (diff) | |
www/chromium: update to 63.0.3239.132
Submitted by: cpm
Obtained from: https://github.com/cpu82/freebsd-chromium
MFH: 2018Q1
Security: https://vuxml.freebsd.org/freebsd/e264e74e-ffe0-11e7-8b91-e8e0b747a45a.html
Security: https://vuxml.freebsd.org/freebsd/1d951e85-ffdb-11e7-8b91-e8e0b747a45a.html
Security: https://vuxml.freebsd.org/freebsd/82894193-ffd4-11e7-8b91-e8e0b747a45a.html
Security: https://vuxml.freebsd.org/freebsd/f8e72cd4-c66a-11e7-bb17-e8e0b747a45a.html
Security: https://vuxml.freebsd.org/freebsd/3cd46257-bbc5-11e7-a3bc-e8e0b747a45a.html
Security: https://vuxml.freebsd.org/freebsd/a692bffe-b6ad-11e7-a1c2-e8e0b747a45a.html
Diffstat (limited to 'www/chromium/files/patch-media_audio_audio__manager.cc')
| -rw-r--r-- | www/chromium/files/patch-media_audio_audio__manager.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/www/chromium/files/patch-media_audio_audio__manager.cc b/www/chromium/files/patch-media_audio_audio__manager.cc index 537a12accdbc..a80ccb2948e0 100644 --- a/www/chromium/files/patch-media_audio_audio__manager.cc +++ b/www/chromium/files/patch-media_audio_audio__manager.cc @@ -1,29 +1,29 @@ ---- media/audio/audio_manager.cc.orig 2017-06-05 19:03:08 UTC -+++ media/audio/audio_manager.cc -@@ -93,7 +93,7 @@ class AudioManagerHelper : public base::PowerObserver +--- media/audio/audio_manager.cc.orig 2017-12-15 02:04:21.000000000 +0100 ++++ media/audio/audio_manager.cc 2017-12-24 17:10:24.736979000 +0100 +@@ -94,7 +94,7 @@ } #endif -#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_FREEBSD) ++#if defined(OS_LINUX) || defined(OS_BSD) void set_app_name(const std::string& app_name) { app_name_ = app_name; } const std::string& app_name() const { return app_name_; } #endif -@@ -227,7 +227,7 @@ class AudioManagerHelper : public base::PowerObserver +@@ -229,7 +229,7 @@ std::unique_ptr<base::win::ScopedCOMInitializer> com_initializer_for_testing_; #endif -#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_FREEBSD) ++#if defined(OS_LINUX) || defined(OS_BSD) std::string app_name_; #endif -@@ -340,7 +340,7 @@ void AudioManager::StartHangMonitorIfNeeded( +@@ -313,7 +313,7 @@ GetHelper()->StartHangTimer(std::move(task_runner)); } -#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_FREEBSD) ++#if defined(OS_LINUX) || defined(OS_BSD) // static void AudioManager::SetGlobalAppName(const std::string& app_name) { GetHelper()->set_app_name(app_name); |