Index: chrome/browser/browser_main.cc |
=================================================================== |
--- chrome/browser/browser_main.cc (revision 25977) |
+++ chrome/browser/browser_main.cc (working copy) |
@@ -112,7 +112,7 @@ |
#include "sandbox/src/sandbox.h" |
#endif // defined(OS_WIN) |
-#if defined(OS_LINUX) |
+#if defined(USE_X11) |
#include "chrome/common/gtk_util.h" |
#endif |
@@ -130,7 +130,7 @@ |
void WillInitializeMainMessageLoop(const MainFunctionParams& parameters); |
void WillTerminate(); |
-#if defined(OS_WIN) || defined(OS_LINUX) |
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_FREEBSD) |
// Perform any platform-specific work that needs to be done before the main |
// message loop is created and initialized. |
void WillInitializeMainMessageLoop(const MainFunctionParams& parameters) { |
@@ -203,7 +203,7 @@ |
#if defined(TOOLKIT_VIEWS) |
views::AcceleratorHandler accelerator_handler; |
MessageLoopForUI::current()->Run(&accelerator_handler); |
-#elif defined(OS_LINUX) |
+#elif defined(USE_X11) |
MessageLoopForUI::current()->Run(NULL); |
#elif defined(OS_POSIX) |
MessageLoopForUI::current()->Run(); |
@@ -455,7 +455,7 @@ |
} |
#endif // !defined(OS_MACOSX) |
-#if defined(OS_LINUX) |
+#if defined(USE_X11) |
gtk_util::SetDefaultWindowIcon(); |
#endif |
@@ -534,11 +534,11 @@ |
#if defined(OS_WIN) |
user_data_dir = FilePath::FromWStringHack( |
UserDataDirDialog::RunUserDataDirDialog(user_data_dir.ToWStringHack())); |
-#elif defined(OS_LINUX) |
+#elif defined(OS_LINUX) || defined(OS_FREEBSD) |
// TODO(port): fix this. |
user_data_dir = FilePath("/tmp"); |
#endif |
-#if defined(OS_WIN) || defined(OS_LINUX) |
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_FREEBSD) |
if (!parameters.ui_task && browser_shutdown::delete_resources_on_shutdown) { |
// Only delete the resources if we're not running tests. If we're running |
// tests the resources need to be reused as many places in the UI cache |
@@ -556,7 +556,7 @@ |
user_data_dir.ToWStringHack()); |
base::LaunchApp(new_command_line, false, false, NULL); |
} |
-#endif // defined(OS_WIN) || defined(OS_LINUX) |
+#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_FREEBSD) |
return ResultCodes::NORMAL_EXIT; |
} |
@@ -621,7 +621,7 @@ |
break; |
case ProcessSingleton::PROCESS_NOTIFIED: |
-#if defined(OS_LINUX) |
+#if defined(OS_LINUX) || defined(OS_FREEBSD) |
printf("%s\n", base::SysWideToNativeMB( |
l10n_util::GetString(IDS_USED_EXISTING_BROWSER)).c_str()); |
#endif |