c62329ccbd
Changes include: - More developer control over touch input - New JavaScript features - Unprefixed Shadow DOM - A number of new apps/extension APIs - Lots of under the hood changes for stability and performance MFH: 2014Q2 Security: http://vuxml.org/freebsd/64f3872b-e05d-11e3-9dd4-00262d5ed8ee.html
83 lines
3 KiB
C++
83 lines
3 KiB
C++
--- ./chrome/app/chrome_main_delegate.cc.orig 2014-04-30 22:42:53.000000000 +0200
|
|
+++ ./chrome/app/chrome_main_delegate.cc 2014-05-04 14:38:46.000000000 +0200
|
|
@@ -95,7 +95,7 @@
|
|
#include "ui/base/x/x11_util.h"
|
|
#endif
|
|
|
|
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
|
|
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
|
|
#include "components/breakpad/app/breakpad_linux.h"
|
|
#endif
|
|
|
|
@@ -121,7 +121,7 @@
|
|
g_chrome_content_plugin_client = LAZY_INSTANCE_INITIALIZER;
|
|
#endif
|
|
|
|
-#if defined(OS_POSIX)
|
|
+#if defined(OS_POSIX) && !defined(OS_BSD)
|
|
base::LazyInstance<chrome::ChromeBreakpadClient>::Leaky
|
|
g_chrome_breakpad_client = LAZY_INSTANCE_INITIALIZER;
|
|
#endif
|
|
@@ -243,7 +243,7 @@
|
|
// Needed for scrollbar related images.
|
|
process_type == switches::kWorkerProcess ||
|
|
#endif
|
|
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
|
|
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
|
|
// The zygote process opens the resources for the renderers.
|
|
process_type == switches::kZygoteProcess ||
|
|
#endif
|
|
@@ -457,7 +457,7 @@
|
|
std::string format_str =
|
|
command_line.GetSwitchValueASCII(switches::kDiagnosticsFormat);
|
|
if (format_str == "machine") {
|
|
- format = diagnostics::DiagnosticsWriter::MACHINE;
|
|
+ format = diagnostics::DiagnosticsWriter::THEMACHINE;
|
|
} else if (format_str == "log") {
|
|
format = diagnostics::DiagnosticsWriter::LOG;
|
|
} else {
|
|
@@ -498,7 +498,7 @@
|
|
std::string format_str =
|
|
command_line.GetSwitchValueASCII(switches::kDiagnosticsFormat);
|
|
if (format_str == "machine") {
|
|
- format = diagnostics::DiagnosticsWriter::MACHINE;
|
|
+ format = diagnostics::DiagnosticsWriter::THEMACHINE;
|
|
} else if (format_str == "human") {
|
|
format = diagnostics::DiagnosticsWriter::HUMAN;
|
|
} else {
|
|
@@ -630,7 +630,7 @@
|
|
std::string process_type =
|
|
command_line.GetSwitchValueASCII(switches::kProcessType);
|
|
|
|
-#if defined(OS_POSIX)
|
|
+#if defined(OS_POSIX) && !defined(OS_BSD)
|
|
breakpad::SetBreakpadClient(g_chrome_breakpad_client.Pointer());
|
|
#endif
|
|
|
|
@@ -748,7 +748,7 @@
|
|
#endif
|
|
}
|
|
|
|
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
|
|
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_FREEBSD)
|
|
// Zygote needs to call InitCrashReporter() in RunZygote().
|
|
if (process_type != switches::kZygoteProcess) {
|
|
#if defined(OS_ANDROID)
|
|
@@ -760,7 +760,7 @@
|
|
breakpad::InitCrashReporter(process_type);
|
|
#endif // defined(OS_ANDROID)
|
|
}
|
|
-#endif // defined(OS_POSIX) && !defined(OS_MACOSX)
|
|
+#endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_FREEBSD)
|
|
|
|
// After all the platform Breakpads have been initialized, store the command
|
|
// line for crash reporting.
|
|
@@ -845,7 +845,7 @@
|
|
return process_type == switches::kNaClLoaderProcess ||
|
|
process_type == switches::kRelauncherProcess;
|
|
}
|
|
-#elif defined(OS_POSIX) && !defined(OS_ANDROID)
|
|
+#elif defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_BSD)
|
|
content::ZygoteForkDelegate* ChromeMainDelegate::ZygoteStarting() {
|
|
#if defined(DISABLE_NACL)
|
|
return NULL;
|