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.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/www/chromium/files/patch-chrome_app_chrome__main.cc b/www/chromium/files/patch-chrome_app_chrome__main.cc
index a3195d190da7..50542f52cbce 100644
--- a/www/chromium/files/patch-chrome_app_chrome__main.cc
+++ b/www/chromium/files/patch-chrome_app_chrome__main.cc
@@ -1,6 +1,6 @@
---- chrome/app/chrome_main.cc.orig 2017-05-09 19:02:41 UTC
+--- 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** ar
+@@ -97,14 +97,14 @@ int ChromeMain(int argc, const char** argv) {
ALLOW_UNUSED_LOCAL(command_line);
#endif
@@ -15,5 +15,5 @@
-#endif // defined(OS_LINUX) || defined(OS_MACOSX)
+#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
- #if BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES)
+ #if defined(OS_CHROMEOS) && BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES)
version_info::Channel channel = chrome::GetChannel();