Index: chrome/browser/chrome_content_browser_client.cc |
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc |
index d1651a8426be543a8e3e3ac0e63640e52df161ff..01848af275e963cc4cfbf0128e609e7fcef1eef3 100644 |
--- a/chrome/browser/chrome_content_browser_client.cc |
+++ b/chrome/browser/chrome_content_browser_client.cc |
@@ -82,7 +82,7 @@ |
#include "chrome/browser/chrome_browser_main_mac.h" |
#elif defined(OS_CHROMEOS) |
#include "chrome/browser/chromeos/chrome_browser_main_chromeos.h" |
-#elif defined(OS_LINUX) |
+#elif defined(OS_LINUX) || defined(OS_OPENBSD) |
#include "chrome/browser/chrome_browser_main_linux.h" |
#elif defined(OS_POSIX) |
#include "chrome/browser/chrome_browser_main_posix.h" |
@@ -96,7 +96,7 @@ |
#include "chrome/browser/chrome_browser_parts_gtk.h" |
#endif |
-#if defined(OS_LINUX) |
+#if defined(OS_POSIX) && !defined(OS_MACOSX) |
#include "base/linux_util.h" |
#include "chrome/browser/crash_handler_host_linux.h" |
#endif |
@@ -209,7 +209,7 @@ void ChromeContentBrowserClient::CreateBrowserMainParts( |
parts_list->push_back(new ChromeBrowserMainPartsMac(parameters)); |
#elif defined(OS_CHROMEOS) |
parts_list->push_back(new ChromeBrowserMainPartsChromeos(parameters)); |
-#elif defined(OS_LINUX) |
+#elif defined(OS_LINUX) || defined(OS_OPENBSD) |
parts_list->push_back(new ChromeBrowserMainPartsLinux(parameters)); |
#elif defined(OS_POSIX) |
parts_list->push_back(new ChromeBrowserMainPartsPosix(parameters)); |
@@ -951,7 +951,7 @@ std::string ChromeContentBrowserClient::GetDefaultDownloadName() { |
return l10n_util::GetStringUTF8(IDS_DEFAULT_DOWNLOAD_FILENAME); |
} |
-#if defined(OS_LINUX) |
+#if defined(OS_POSIX) && !defined(OS_MACOSX) |
int ChromeContentBrowserClient::GetCrashSignalFD( |
const CommandLine& command_line) { |
if (command_line.HasSwitch(switches::kExtensionProcess)) { |
@@ -977,7 +977,7 @@ int ChromeContentBrowserClient::GetCrashSignalFD( |
return -1; |
} |
-#endif // defined(OS_LINUX) |
+#endif // defined(OS_POSIX) && !defined(OS_MACOSX) |
#if defined(OS_WIN) |
const wchar_t* ChromeContentBrowserClient::GetResourceDllName() { |