mirror of
https://git.freebsd.org/ports.git
synced 2025-06-21 04:30:37 -04:00
d90bf58cf8
- Make existing patches apply cleanly Changelog: https://chromium.googlesource.com/chromium/src/+log/72.0.3626.121..73.0.3683.86?pretty=fuller&n=10000 Submitted by: Matthias Wolf MFH: 2019Q2
34 lines
1.5 KiB
C++
34 lines
1.5 KiB
C++
--- chrome/browser/process_singleton_posix.cc.orig 2019-03-11 22:00:53 UTC
|
|
+++ chrome/browser/process_singleton_posix.cc
|
|
@@ -93,11 +93,11 @@
|
|
#include "net/base/network_interfaces.h"
|
|
#include "ui/base/l10n/l10n_util.h"
|
|
|
|
-#if defined(OS_LINUX)
|
|
+#if defined(OS_LINUX) || defined(OS_BSD)
|
|
#include "chrome/browser/ui/process_singleton_dialog_linux.h"
|
|
#endif
|
|
|
|
-#if defined(TOOLKIT_VIEWS) && defined(OS_LINUX) && !defined(OS_CHROMEOS)
|
|
+#if defined(TOOLKIT_VIEWS) && (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
|
|
#include "ui/views/linux_ui/linux_ui.h"
|
|
#endif
|
|
|
|
@@ -325,7 +325,7 @@ bool DisplayProfileInUseError(const base::FilePath& lo
|
|
if (g_disable_prompt)
|
|
return g_user_opted_unlock_in_use_profile;
|
|
|
|
-#if defined(OS_LINUX)
|
|
+#if defined(OS_LINUX) || defined(OS_BSD)
|
|
base::string16 relaunch_button_text = l10n_util::GetStringUTF16(
|
|
IDS_PROFILE_IN_USE_LINUX_RELAUNCH);
|
|
return ShowProcessSingletonDialog(error, relaunch_button_text);
|
|
@@ -904,7 +904,7 @@ ProcessSingleton::NotifyResult ProcessSingleton::Notif
|
|
SendRemoteProcessInteractionResultHistogram(REMOTE_PROCESS_SHUTTING_DOWN);
|
|
return PROCESS_NONE;
|
|
} else if (strncmp(buf, kACKToken, base::size(kACKToken) - 1) == 0) {
|
|
-#if defined(TOOLKIT_VIEWS) && defined(OS_LINUX) && !defined(OS_CHROMEOS)
|
|
+#if defined(TOOLKIT_VIEWS) && (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
|
|
// Likely NULL in unit tests.
|
|
views::LinuxUI* linux_ui = views::LinuxUI::instance();
|
|
if (linux_ui)
|