summaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc
diff options
context:
space:
mode:
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.cc6
1 files changed, 3 insertions, 3 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 f6752e3b9774..91f3b0a5351f 100644
--- a/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc
+++ b/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc
@@ -1,4 +1,4 @@
---- chrome/browser/process_singleton_posix.cc.orig 2017-04-19 19:06:29 UTC
+--- chrome/browser/process_singleton_posix.cc.orig 2017-06-05 19:03:02 UTC
+++ chrome/browser/process_singleton_posix.cc
@@ -93,11 +93,11 @@
#include "net/base/network_interfaces.h"
@@ -14,7 +14,7 @@
#include "ui/views/linux_ui/linux_ui.h"
#endif
-@@ -321,7 +321,7 @@ bool DisplayProfileInUseError(const base
+@@ -322,7 +322,7 @@ bool DisplayProfileInUseError(const base::FilePath& lo
if (g_disable_prompt)
return false;
@@ -23,7 +23,7 @@
base::string16 relaunch_button_text = l10n_util::GetStringUTF16(
IDS_PROFILE_IN_USE_LINUX_RELAUNCH);
return ShowProcessSingletonDialog(error, relaunch_button_text);
-@@ -855,7 +855,7 @@ ProcessSingleton::NotifyResult ProcessSi
+@@ -866,7 +866,7 @@ ProcessSingleton::NotifyResult ProcessSingleton::Notif
// The other process is shutting down, it's safe to start a new process.
return PROCESS_NONE;
} else if (strncmp(buf, kACKToken, arraysize(kACKToken) - 1) == 0) {