summaryrefslogtreecommitdiff
path: root/www/iridium/files/patch-chrome_app_chrome__main.cc
diff options
context:
space:
mode:
Diffstat (limited to 'www/iridium/files/patch-chrome_app_chrome__main.cc')
-rw-r--r--www/iridium/files/patch-chrome_app_chrome__main.cc22
1 files changed, 11 insertions, 11 deletions
diff --git a/www/iridium/files/patch-chrome_app_chrome__main.cc b/www/iridium/files/patch-chrome_app_chrome__main.cc
index a3195d190da7..ea26c9429517 100644
--- a/www/iridium/files/patch-chrome_app_chrome__main.cc
+++ b/www/iridium/files/patch-chrome_app_chrome__main.cc
@@ -1,19 +1,19 @@
---- chrome/app/chrome_main.cc.orig 2017-05-09 19:02:41 UTC
-+++ chrome/app/chrome_main.cc
-@@ -97,14 +97,14 @@ int ChromeMain(int argc, const char** ar
+--- chrome/app/chrome_main.cc.orig 2017-09-05 21:05:12.000000000 +0200
++++ chrome/app/chrome_main.cc 2017-09-06 17:23:42.720920000 +0200
+@@ -99,14 +99,14 @@
ALLOW_UNUSED_LOCAL(command_line);
- #endif
--#if defined(OS_LINUX) || defined(OS_MACOSX)
-+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
+ // Chrome-specific process modes.
+-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
if (command_line->HasSwitch(switches::kHeadless)) {
#if defined(OS_MACOSX)
SetUpBundleOverrides();
#endif
- return headless::HeadlessShellMain(argc, argv);
+ return headless::HeadlessShellMain(params);
}
--#endif // defined(OS_LINUX) || defined(OS_MACOSX)
-+#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
+-#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
++#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
- #if BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES)
- version_info::Channel channel = chrome::GetChannel();
+ #if BUILDFLAG(ENABLE_OOP_HEAP_PROFILING)
+ #if !defined(OS_WIN) || defined(COMPONENT_BUILD) || \