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

Side by Side Diff: base/message_loop.h

Issue 10823328: Fix Native Client untrusted build of base with USE_AURA. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 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 | « no previous file | no next file » | 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) 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 7
8 #include <queue> 8 #include <queue>
9 #include <string> 9 #include <string>
10 10
(...skipping 12 matching lines...) Expand all
23 #include "base/time.h" 23 #include "base/time.h"
24 24
25 #if defined(OS_WIN) 25 #if defined(OS_WIN)
26 // We need this to declare base::MessagePumpWin::Dispatcher, which we should 26 // We need this to declare base::MessagePumpWin::Dispatcher, which we should
27 // really just eliminate. 27 // really just eliminate.
28 #include "base/message_pump_win.h" 28 #include "base/message_pump_win.h"
29 #elif defined(OS_POSIX) 29 #elif defined(OS_POSIX)
30 #include "base/message_pump_libevent.h" 30 #include "base/message_pump_libevent.h"
31 #if !defined(OS_MACOSX) && !defined(OS_ANDROID) 31 #if !defined(OS_MACOSX) && !defined(OS_ANDROID)
32 32
33 #if defined(USE_AURA) 33 #if defined(USE_AURA) && !defined(OS_NACL)
34 #include "base/message_pump_aurax11.h" 34 #include "base/message_pump_aurax11.h"
35 #else 35 #else
36 #include "base/message_pump_gtk.h" 36 #include "base/message_pump_gtk.h"
37 #endif 37 #endif
38 38
39 #endif 39 #endif
40 #endif 40 #endif
41 41
42 namespace base { 42 namespace base {
43 class Histogram; 43 class Histogram;
(...skipping 611 matching lines...) Expand 10 before | Expand all | Expand 10 after
655 #endif // defined(OS_POSIX) 655 #endif // defined(OS_POSIX)
656 }; 656 };
657 657
658 // Do not add any member variables to MessageLoopForIO! This is important b/c 658 // Do not add any member variables to MessageLoopForIO! This is important b/c
659 // MessageLoopForIO is often allocated via MessageLoop(TYPE_IO). Any extra 659 // MessageLoopForIO is often allocated via MessageLoop(TYPE_IO). Any extra
660 // data that you need should be stored on the MessageLoop's pump_ instance. 660 // data that you need should be stored on the MessageLoop's pump_ instance.
661 COMPILE_ASSERT(sizeof(MessageLoop) == sizeof(MessageLoopForIO), 661 COMPILE_ASSERT(sizeof(MessageLoop) == sizeof(MessageLoopForIO),
662 MessageLoopForIO_should_not_have_extra_member_variables); 662 MessageLoopForIO_should_not_have_extra_member_variables);
663 663
664 #endif // BASE_MESSAGE_LOOP_H_ 664 #endif // BASE_MESSAGE_LOOP_H_
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698