| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef BASE_MESSAGE_LOOP_H_ | 5 #ifndef BASE_MESSAGE_LOOP_H_ |
| 6 #define BASE_MESSAGE_LOOP_H_ | 6 #define BASE_MESSAGE_LOOP_H_ |
| 7 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include <queue> | 9 #include <queue> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 13 matching lines...) Expand all Loading... |
| 24 #include "base/time.h" | 24 #include "base/time.h" |
| 25 | 25 |
| 26 #if defined(OS_WIN) | 26 #if defined(OS_WIN) |
| 27 // We need this to declare base::MessagePumpWin::Dispatcher, which we should | 27 // We need this to declare base::MessagePumpWin::Dispatcher, which we should |
| 28 // really just eliminate. | 28 // really just eliminate. |
| 29 #include "base/message_pump_win.h" | 29 #include "base/message_pump_win.h" |
| 30 #elif defined(OS_POSIX) | 30 #elif defined(OS_POSIX) |
| 31 #include "base/message_pump_libevent.h" | 31 #include "base/message_pump_libevent.h" |
| 32 #if !defined(OS_MACOSX) && !defined(OS_ANDROID) | 32 #if !defined(OS_MACOSX) && !defined(OS_ANDROID) |
| 33 | 33 |
| 34 #if defined(USE_WAYLAND) | 34 #if defined(USE_AURA) |
| 35 #include "base/message_pump_wayland.h" | |
| 36 #elif defined(USE_AURA) | |
| 37 #include "base/message_pump_x.h" | 35 #include "base/message_pump_x.h" |
| 38 #else | 36 #else |
| 39 #include "base/message_pump_gtk.h" | 37 #include "base/message_pump_gtk.h" |
| 40 #endif | 38 #endif |
| 41 | 39 |
| 42 #endif | 40 #endif |
| 43 #endif | 41 #endif |
| 44 | 42 |
| 45 namespace base { | 43 namespace base { |
| 46 class Histogram; | 44 class Histogram; |
| (...skipping 614 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 661 #endif // defined(OS_POSIX) | 659 #endif // defined(OS_POSIX) |
| 662 }; | 660 }; |
| 663 | 661 |
| 664 // Do not add any member variables to MessageLoopForIO! This is important b/c | 662 // Do not add any member variables to MessageLoopForIO! This is important b/c |
| 665 // MessageLoopForIO is often allocated via MessageLoop(TYPE_IO). Any extra | 663 // MessageLoopForIO is often allocated via MessageLoop(TYPE_IO). Any extra |
| 666 // data that you need should be stored on the MessageLoop's pump_ instance. | 664 // data that you need should be stored on the MessageLoop's pump_ instance. |
| 667 COMPILE_ASSERT(sizeof(MessageLoop) == sizeof(MessageLoopForIO), | 665 COMPILE_ASSERT(sizeof(MessageLoop) == sizeof(MessageLoopForIO), |
| 668 MessageLoopForIO_should_not_have_extra_member_variables); | 666 MessageLoopForIO_should_not_have_extra_member_variables); |
| 669 | 667 |
| 670 #endif // BASE_MESSAGE_LOOP_H_ | 668 #endif // BASE_MESSAGE_LOOP_H_ |
| OLD | NEW |