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

Side by Side Diff: base/message_loop/message_loop.cc

Issue 723343002: Update from https://crrev.com/304121 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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
« no previous file with comments | « base/memory/scoped_ptr_unittest.cc ('k') | base/metrics/histogram.h » ('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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/message_loop.h" 5 #include "base/message_loop/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 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 } 99 }
100 100
101 #if defined(OS_IOS) 101 #if defined(OS_IOS)
102 typedef MessagePumpIOSForIO MessagePumpForIO; 102 typedef MessagePumpIOSForIO MessagePumpForIO;
103 #elif defined(OS_NACL_SFI) 103 #elif defined(OS_NACL_SFI)
104 typedef MessagePumpDefault MessagePumpForIO; 104 typedef MessagePumpDefault MessagePumpForIO;
105 #elif defined(OS_POSIX) 105 #elif defined(OS_POSIX)
106 typedef MessagePumpLibevent MessagePumpForIO; 106 typedef MessagePumpLibevent MessagePumpForIO;
107 #endif 107 #endif
108 108
109 #if !defined(OS_NACL_SFI)
109 MessagePumpForIO* ToPumpIO(MessagePump* pump) { 110 MessagePumpForIO* ToPumpIO(MessagePump* pump) {
110 return static_cast<MessagePumpForIO*>(pump); 111 return static_cast<MessagePumpForIO*>(pump);
111 } 112 }
113 #endif // !defined(OS_NACL_SFI)
112 114
113 } // namespace 115 } // namespace
114 116
115 //------------------------------------------------------------------------------ 117 //------------------------------------------------------------------------------
116 118
117 MessageLoop::TaskObserver::TaskObserver() { 119 MessageLoop::TaskObserver::TaskObserver() {
118 } 120 }
119 121
120 MessageLoop::TaskObserver::~TaskObserver() { 122 MessageLoop::TaskObserver::~TaskObserver() {
121 } 123 }
(...skipping 588 matching lines...) Expand 10 before | Expand all | Expand 10 after
710 persistent, 712 persistent,
711 mode, 713 mode,
712 controller, 714 controller,
713 delegate); 715 delegate);
714 } 716 }
715 #endif 717 #endif
716 718
717 #endif // !defined(OS_NACL_SFI) 719 #endif // !defined(OS_NACL_SFI)
718 720
719 } // namespace base 721 } // namespace base
OLDNEW
« no previous file with comments | « base/memory/scoped_ptr_unittest.cc ('k') | base/metrics/histogram.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698