Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(147)

Side by Side Diff: base/message_loop.h

Issue 7833016: aura: A few changes to have aura_demo compile and run on linux. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 9 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « base/base.gypi ('k') | base/message_loop.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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
24 #if defined(OS_WIN) 24 #if defined(OS_WIN)
25 // We need this to declare base::MessagePumpWin::Dispatcher, which we should 25 // We need this to declare base::MessagePumpWin::Dispatcher, which we should
26 // really just eliminate. 26 // really just eliminate.
27 #include "base/message_pump_win.h" 27 #include "base/message_pump_win.h"
28 #elif defined(OS_POSIX) 28 #elif defined(OS_POSIX)
29 #include "base/message_pump_libevent.h" 29 #include "base/message_pump_libevent.h"
30 #if !defined(OS_MACOSX) 30 #if !defined(OS_MACOSX)
31 31
32 #if defined(USE_WAYLAND) 32 #if defined(USE_WAYLAND)
33 #include "base/message_pump_wayland.h" 33 #include "base/message_pump_wayland.h"
34 #elif defined(TOUCH_UI) 34 #elif defined(TOUCH_UI) || defined(USE_AURA)
35 #include "base/message_pump_x.h" 35 #include "base/message_pump_x.h"
36 #else 36 #else
37 #include "base/message_pump_gtk.h" 37 #include "base/message_pump_gtk.h"
38 #endif 38 #endif
39 39
40 #endif 40 #endif
41 #endif 41 #endif
42 42
43 namespace base { 43 namespace base {
44 class Histogram; 44 class Histogram;
(...skipping 661 matching lines...) Expand 10 before | Expand all | Expand 10 after
706 #endif // defined(OS_POSIX) 706 #endif // defined(OS_POSIX)
707 }; 707 };
708 708
709 // Do not add any member variables to MessageLoopForIO! This is important b/c 709 // Do not add any member variables to MessageLoopForIO! This is important b/c
710 // MessageLoopForIO is often allocated via MessageLoop(TYPE_IO). Any extra 710 // MessageLoopForIO is often allocated via MessageLoop(TYPE_IO). Any extra
711 // data that you need should be stored on the MessageLoop's pump_ instance. 711 // data that you need should be stored on the MessageLoop's pump_ instance.
712 COMPILE_ASSERT(sizeof(MessageLoop) == sizeof(MessageLoopForIO), 712 COMPILE_ASSERT(sizeof(MessageLoop) == sizeof(MessageLoopForIO),
713 MessageLoopForIO_should_not_have_extra_member_variables); 713 MessageLoopForIO_should_not_have_extra_member_variables);
714 714
715 #endif // BASE_MESSAGE_LOOP_H_ 715 #endif // BASE_MESSAGE_LOOP_H_
OLDNEW
« no previous file with comments | « base/base.gypi ('k') | base/message_loop.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698