summaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-chrome_app_mash_mash__runner.cc
diff options
context:
space:
mode:
authorCarlos J. Puga Medina <cpm@FreeBSD.org>2017-03-17 23:42:52 +0000
committerCarlos J. Puga Medina <cpm@FreeBSD.org>2017-03-17 23:42:52 +0000
commite292ba0099ecff2e3e31fcb6cac28ac8e243c43d (patch)
tree1b74950e1b5750f688522886a8b73c01e56a18c5 /www/chromium/files/patch-chrome_app_mash_mash__runner.cc
parentgames/openra: update GeoLite2 to March snapshot (diff)
www/chromium: update to 57.0.2987.110
MFH: 2017Q1 Security: https://vuxml.freebsd.org/freebsd/a505d397-0758-11e7-8d8b-e8e0b747a45a.html
Diffstat (limited to 'www/chromium/files/patch-chrome_app_mash_mash__runner.cc')
-rw-r--r--www/chromium/files/patch-chrome_app_mash_mash__runner.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/www/chromium/files/patch-chrome_app_mash_mash__runner.cc b/www/chromium/files/patch-chrome_app_mash_mash__runner.cc
index aeb5d9c1e1cf..74b467c8fcdf 100644
--- a/www/chromium/files/patch-chrome_app_mash_mash__runner.cc
+++ b/www/chromium/files/patch-chrome_app_mash_mash__runner.cc
@@ -1,11 +1,11 @@
---- chrome/app/mash/mash_runner.cc.orig 2017-02-02 02:02:48 UTC
+--- chrome/app/mash/mash_runner.cc.orig 2017-03-09 20:04:27 UTC
+++ chrome/app/mash/mash_runner.cc
-@@ -207,7 +207,7 @@ int MashMain() {
+@@ -249,7 +249,7 @@ int MashMain() {
+ // TODO(sky): wire this up correctly.
service_manager::InitializeLogging();
- std::unique_ptr<base::MessageLoop> message_loop;
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
base::AtExitManager exit_manager;
#endif
- if (!IsChild())
+