aboutsummaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-chrome_app_chrome__main.cc
diff options
context:
space:
mode:
Diffstat (limited to 'www/chromium/files/patch-chrome_app_chrome__main.cc')
-rw-r--r--www/chromium/files/patch-chrome_app_chrome__main.cc20
1 files changed, 6 insertions, 14 deletions
diff --git a/www/chromium/files/patch-chrome_app_chrome__main.cc b/www/chromium/files/patch-chrome_app_chrome__main.cc
index 50542f52cbce..450c2c6b0bc2 100644
--- a/www/chromium/files/patch-chrome_app_chrome__main.cc
+++ b/www/chromium/files/patch-chrome_app_chrome__main.cc
@@ -1,19 +1,11 @@
---- chrome/app/chrome_main.cc.orig 2017-06-05 19:03:01 UTC
-+++ chrome/app/chrome_main.cc
-@@ -97,14 +97,14 @@ int ChromeMain(int argc, const char** argv) {
+--- chrome/app/chrome_main.cc.orig 2017-07-25 21:04:49.000000000 +0200
++++ chrome/app/chrome_main.cc 2017-08-01 23:35:54.553290000 +0200
+@@ -92,7 +92,7 @@
+ const base::CommandLine* command_line(base::CommandLine::ForCurrentProcess());
ALLOW_UNUSED_LOCAL(command_line);
- #endif
--#if defined(OS_LINUX) || defined(OS_MACOSX)
-+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
+-#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);
- }
--#endif // defined(OS_LINUX) || defined(OS_MACOSX)
-+#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
-
- #if defined(OS_CHROMEOS) && BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES)
- version_info::Channel channel = chrome::GetChannel();