diff options
Diffstat (limited to 'www/chromium/files/patch-chrome_browser_process__singleton__posix.cc')
| -rw-r--r-- | www/chromium/files/patch-chrome_browser_process__singleton__posix.cc | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc b/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc index 685ecb00646f..f78dd938359c 100644 --- a/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc +++ b/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc @@ -1,6 +1,6 @@ ---- chrome/browser/process_singleton_posix.cc.orig 2020-11-13 06:36:37 UTC +--- chrome/browser/process_singleton_posix.cc.orig 2021-03-12 23:57:18 UTC +++ chrome/browser/process_singleton_posix.cc -@@ -94,11 +94,11 @@ +@@ -95,12 +95,12 @@ #include "net/base/network_interfaces.h" #include "ui/base/l10n/l10n_util.h" @@ -9,12 +9,13 @@ #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) + #if defined(TOOLKIT_VIEWS) && \ +- (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) ++ (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) #include "ui/views/linux_ui/linux_ui.h" #endif -@@ -295,7 +295,7 @@ bool DisplayProfileInUseError(const base::FilePath& lo +@@ -297,7 +297,7 @@ bool DisplayProfileInUseError(const base::FilePath& lo if (g_disable_prompt) return g_user_opted_unlock_in_use_profile; @@ -23,12 +24,12 @@ base::string16 relaunch_button_text = l10n_util::GetStringUTF16( IDS_PROFILE_IN_USE_LINUX_RELAUNCH); return ShowProcessSingletonDialog(error, relaunch_button_text); -@@ -871,7 +871,7 @@ ProcessSingleton::NotifyResult ProcessSingleton::Notif - SendRemoteProcessInteractionResultHistogram(REMOTE_PROCESS_SHUTTING_DOWN); +@@ -874,7 +874,7 @@ ProcessSingleton::NotifyResult ProcessSingleton::Notif 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) + #if defined(TOOLKIT_VIEWS) && \ +- (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) ++ (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) // Likely NULL in unit tests. views::LinuxUI* linux_ui = views::LinuxUI::instance(); if (linux_ui) |