diff options
| author | darin@google.com <darin@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-19 18:36:23 +0000 |
|---|---|---|
| committer | darin@google.com <darin@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-19 18:36:23 +0000 |
| commit | b16ef312cb28582a1d324d20e4328afeef2c7538 (patch) | |
| tree | bcbc40bbe3950501c888eab655f5070619ad1ac7 /base/logging.cc | |
| parent | 4880adb3346faa91feea9d8ecfecc4ef499bf7fc (diff) | |
| download | chromium_src-b16ef312cb28582a1d324d20e4328afeef2c7538.zip chromium_src-b16ef312cb28582a1d324d20e4328afeef2c7538.tar.gz chromium_src-b16ef312cb28582a1d324d20e4328afeef2c7538.tar.bz2 | |
Define MessagePumpDefault and use it to implement MessageLoop on non-Windows
platforms. This is actually just a first-step toward the real fix which is to
use MessagePumpDefault on all platforms on non-UI and non-IO threads.
This CL also fixes some GCC compilation errors. I renamed MessageLoopOwnable
to TaskBase, which seems more appropriate since a MessageLoopOwnable has a
next Task pointer and clearly is only meaningful in the context of Task. (I
wonder why it is even a separate class, but that is another issue.) I had to
make the next_task / set_next_task methods public since they are used by an
inner class of MessageLoop. Perhaps those inner classes should be made into
top-level classes, but that seemed like too much to change at this time.
R=jar,mmentovai
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1045 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/logging.cc')
| -rw-r--r-- | base/logging.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/base/logging.cc b/base/logging.cc index 27781ae0..54418be 100644 --- a/base/logging.cc +++ b/base/logging.cc @@ -27,10 +27,9 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#include "base/notimplemented.h" -#include "build/build_config.h" +#include "base/logging.h" -#if defined(WIN32) +#if defined(OS_WIN) #include <windows.h> typedef HANDLE FileHandle; typedef HANDLE MutexHandle; @@ -57,11 +56,12 @@ typedef pthread_mutex_t* MutexHandle; #include <iomanip> #include <cstring> #include <algorithm> + #include "base/base_switches.h" #include "base/command_line.h" #include "base/debug_util.h" #include "base/lock_impl.h" -#include "base/logging.h" +#include "base/notimplemented.h" #include "base/string_piece.h" #include "base/string_util.h" #include "base/sys_string_conversions.h" |