diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-10 15:09:39 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-10 15:09:39 +0000 |
| commit | 9146221ca83c4996713894316661b442b20c9e28 (patch) | |
| tree | 0cd1efb863d39a4ac44aacde045c957552e3da7d /base/message_loop.cc | |
| parent | 98f5f88b53f774cee109503b0225a5bfb9deb550 (diff) | |
| download | chromium_src-9146221ca83c4996713894316661b442b20c9e28.zip chromium_src-9146221ca83c4996713894316661b442b20c9e28.tar.gz chromium_src-9146221ca83c4996713894316661b442b20c9e28.tar.bz2 | |
Adds some ifdefs so that test_shell can be compiled on linux
without GTK.
I had to recreate this patch as my workspace for various
resonds. UGH!
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/67024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13503 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/message_loop.cc')
| -rw-r--r-- | base/message_loop.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/base/message_loop.cc b/base/message_loop.cc index b4ad2bc..d836c92 100644 --- a/base/message_loop.cc +++ b/base/message_loop.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2009 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -19,7 +19,7 @@ #if defined(OS_POSIX) #include "base/message_pump_libevent.h" #endif -#if defined(OS_LINUX) +#if defined(TOOLKIT_GTK) #include "base/message_pump_glib.h" #endif @@ -99,7 +99,11 @@ MessageLoop::MessageLoop(Type type) #if defined(OS_MACOSX) pump_ = base::MessagePumpMac::Create(); #elif defined(OS_LINUX) +#if defined(TOOLKIT_GTK) pump_ = new base::MessagePumpForUI(); +#else + pump_ = new base::MessagePumpDefault(); +#endif #endif // OS_LINUX } else if (type_ == TYPE_IO) { pump_ = new base::MessagePumpLibevent(); |