summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser_process_impl.cc
diff options
context:
space:
mode:
authorpvalchev@google.com <pvalchev@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-09 19:52:16 +0000
committerpvalchev@google.com <pvalchev@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-09 19:52:16 +0000
commit753efc479384c254e263fd11390846a060fa6ce0 (patch)
tree488097f0622c5d744059f3c2ada4894b683c5305 /chrome/browser/browser_process_impl.cc
parent5e4d24d67febed160e2020f5c8f13d8073921fc4 (diff)
downloadchromium_src-753efc479384c254e263fd11390846a060fa6ce0.zip
chromium_src-753efc479384c254e263fd11390846a060fa6ce0.tar.gz
chromium_src-753efc479384c254e263fd11390846a060fa6ce0.tar.bz2
BSD ifdefs, etc. necessary for chrome/
Review URL: http://codereview.chromium.org/656009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41067 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_process_impl.cc')
-rw-r--r--chrome/browser/browser_process_impl.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
index c510336..9e9e1b0 100644
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -136,7 +136,7 @@ BrowserProcessImpl::~BrowserProcessImpl() {
resource_dispatcher_host()->Shutdown();
}
-#if defined(OS_LINUX)
+#if defined(USE_X11)
// The IO thread must outlive the BACKGROUND_X11 thread.
background_x11_thread_.reset();
#endif
@@ -304,7 +304,7 @@ void BrowserProcessImpl::CreateIOThread() {
// invoke the io_thread() accessor.
PluginService::GetInstance();
-#if defined(OS_LINUX)
+#if defined(USE_X11)
// The lifetime of the BACKGROUND_X11 thread is a subset of the IO thread so
// we start it now.
scoped_ptr<base::Thread> background_x11_thread(