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

Side by Side Diff: base/message_loop.cc

Issue 7978007: Revert 102005 - aura: Explicitly disable GTK. (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_pump_glib_unittest.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 #include "base/message_loop.h" 5 #include "base/message_loop.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 11 matching lines...) Expand all
22 22
23 #if defined(OS_MACOSX) 23 #if defined(OS_MACOSX)
24 #include "base/message_pump_mac.h" 24 #include "base/message_pump_mac.h"
25 #endif 25 #endif
26 #if defined(OS_POSIX) 26 #if defined(OS_POSIX)
27 #include "base/message_pump_libevent.h" 27 #include "base/message_pump_libevent.h"
28 #endif 28 #endif
29 #if defined(OS_ANDROID) 29 #if defined(OS_ANDROID)
30 #include "base/message_pump_android.h" 30 #include "base/message_pump_android.h"
31 #endif 31 #endif
32 #if defined(TOOLKIT_USES_GTK) 32 #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
33 #include <gdk/gdk.h> 33 #include <gdk/gdk.h>
34 #include <gdk/gdkx.h> 34 #include <gdk/gdkx.h>
35 #endif // defined(OS_POSIX) && !defined(OS_MACOSX) 35 #endif // defined(OS_POSIX) && !defined(OS_MACOSX)
36 36
37 using base::TimeDelta; 37 using base::TimeDelta;
38 using base::TimeTicks; 38 using base::TimeTicks;
39 39
40 namespace { 40 namespace {
41 41
42 // A lazily created thread local storage for quick access to a thread's message 42 // A lazily created thread local storage for quick access to a thread's message
(...skipping 803 matching lines...) Expand 10 before | Expand all | Expand 10 after
846 Watcher *delegate) { 846 Watcher *delegate) {
847 return pump_libevent()->WatchFileDescriptor( 847 return pump_libevent()->WatchFileDescriptor(
848 fd, 848 fd,
849 persistent, 849 persistent,
850 static_cast<base::MessagePumpLibevent::Mode>(mode), 850 static_cast<base::MessagePumpLibevent::Mode>(mode),
851 controller, 851 controller,
852 delegate); 852 delegate);
853 } 853 }
854 854
855 #endif 855 #endif
OLDNEW
« no previous file with comments | « base/base.gypi ('k') | base/message_pump_glib_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698