diff options
| author | pvalchev@google.com <pvalchev@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-01 18:37:14 +0000 |
|---|---|---|
| committer | pvalchev@google.com <pvalchev@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-01 18:37:14 +0000 |
| commit | b2aa3ed777110d64e6647285fc3650bd5455681c (patch) | |
| tree | d738ea5089cc1b6bd6b09e51fc9da672c912bc99 /chrome/app | |
| parent | 70f2c448125ebe327d97596af088d8e81e82b901 (diff) | |
| download | chromium_src-b2aa3ed777110d64e6647285fc3650bd5455681c.zip chromium_src-b2aa3ed777110d64e6647285fc3650bd5455681c.tar.gz chromium_src-b2aa3ed777110d64e6647285fc3650bd5455681c.tar.bz2 | |
BSD port: chrome/app and chrome/browser ifdef cleaning
Review URL: http://codereview.chromium.org/548203
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37714 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
| -rw-r--r-- | chrome/app/chrome_dll_main.cc | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/chrome/app/chrome_dll_main.cc b/chrome/app/chrome_dll_main.cc index 1e3cb83..f30e39a 100644 --- a/chrome/app/chrome_dll_main.cc +++ b/chrome/app/chrome_dll_main.cc @@ -23,7 +23,7 @@ #include <unistd.h> #endif -#if defined(OS_LINUX) +#if defined(OS_POSIX) && !defined(OS_MACOSX) #include <gdk/gdk.h> #include <glib.h> #include <gtk/gtk.h> @@ -57,8 +57,11 @@ #include "chrome/common/sandbox_init_wrapper.h" #include "ipc/ipc_switches.h" -#if defined(OS_LINUX) +#if defined(USE_NSS) #include "base/nss_util.h" +#endif + +#if defined(OS_LINUX) #include "chrome/browser/renderer_host/render_sandbox_host_linux.h" #include "chrome/browser/zygote_host_linux.h" #endif @@ -191,7 +194,7 @@ bool HasDeprecatedArguments(const std::wstring& command_line) { #endif // OS_WIN -#if defined(OS_LINUX) +#if defined(OS_POSIX) && !defined(OS_MACOSX) static void GLibLogHandler(const gchar* log_domain, GLogLevelFlags log_level, const gchar* message, @@ -278,7 +281,7 @@ static void AdjustLinuxOOMScore(const std::string& process_type) { if (score > -1) base::AdjustOOMScore(base::GetCurrentProcId(), score); } -#endif // defined(OS_LINUX) +#endif // defined(OS_POSIX) && !defined(OS_MACOSX) // Register the invalid param handler and pure call handler to be able to // notify breakpad when it happens. @@ -349,7 +352,7 @@ bool SubprocessNeedsResourceBundle(const std::string& process_type) { // Windows needs resources for the default/null plugin. process_type == switches::kPluginProcess || #endif -#if defined(OS_LINUX) +#if defined(OS_POSIX) && !defined(OS_MACOSX) // The zygote process opens the resources for the renderers. process_type == switches::kZygoteProcess || #endif @@ -448,7 +451,7 @@ int ChromeMain(int argc, char** argv) { return 1; #endif -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_CHROMEOS) // Show the man page on --help or -h. if (parsed_command_line.HasSwitch("help") || parsed_command_line.HasSwitch("h")) { @@ -690,7 +693,7 @@ int ChromeMain(int argc, char** argv) { rv = NaClMain(main_params); #endif } else if (process_type == switches::kZygoteProcess) { -#if defined(OS_LINUX) +#if defined(OS_POSIX) && !defined(OS_MACOSX) if (ZygoteMain(main_params)) { // Zygote::HandleForkRequest may have reallocated the command // line so update it here with the new version. |