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

Side by Side Diff: base/threading/thread_restrictions.h

Issue 1641513004: Update //base to chromium 9659b08ea5a34f889dc4166217f438095ddc10d2 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 4 years, 10 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
« no previous file with comments | « base/threading/thread.cc ('k') | base/threading/thread_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) 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_THREADING_THREAD_RESTRICTIONS_H_ 5 #ifndef BASE_THREADING_THREAD_RESTRICTIONS_H_
6 #define BASE_THREADING_THREAD_RESTRICTIONS_H_ 6 #define BASE_THREADING_THREAD_RESTRICTIONS_H_
7 7
8 #include "base/base_export.h" 8 #include "base/base_export.h"
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 10
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 namespace disk_cache { 51 namespace disk_cache {
52 class BackendImpl; 52 class BackendImpl;
53 class InFlightIO; 53 class InFlightIO;
54 } 54 }
55 namespace mojo { 55 namespace mojo {
56 namespace common { 56 namespace common {
57 class WatcherThreadManager; 57 class WatcherThreadManager;
58 } 58 }
59 } 59 }
60 namespace net { 60 namespace net {
61 class NetworkChangeNotifierMac;
61 namespace internal { 62 namespace internal {
62 class AddressTrackerLinux; 63 class AddressTrackerLinux;
63 } 64 }
64 } 65 }
65 66
66 namespace remoting { 67 namespace remoting {
67 class AutoThread; 68 class AutoThread;
68 } 69 }
69 70
70 namespace base { 71 namespace base {
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 friend class 200 friend class
200 content::BrowserGpuChannelHostFactory; // http://crbug.com/125248 201 content::BrowserGpuChannelHostFactory; // http://crbug.com/125248
201 friend class 202 friend class
202 content::BrowserGpuMemoryBufferManager; // http://crbug.com/420368 203 content::BrowserGpuMemoryBufferManager; // http://crbug.com/420368
203 friend class content::GpuChannelHost; // http://crbug.com/125264 204 friend class content::GpuChannelHost; // http://crbug.com/125264
204 friend class content::TextInputClientMac; // http://crbug.com/121917 205 friend class content::TextInputClientMac; // http://crbug.com/121917
205 friend class dbus::Bus; // http://crbug.com/125222 206 friend class dbus::Bus; // http://crbug.com/125222
206 friend class disk_cache::BackendImpl; // http://crbug.com/74623 207 friend class disk_cache::BackendImpl; // http://crbug.com/74623
207 friend class disk_cache::InFlightIO; // http://crbug.com/74623 208 friend class disk_cache::InFlightIO; // http://crbug.com/74623
208 friend class net::internal::AddressTrackerLinux; // http://crbug.com/125097 209 friend class net::internal::AddressTrackerLinux; // http://crbug.com/125097
210 friend class net::NetworkChangeNotifierMac; // http://crbug.com/125097
209 friend class ::BrowserProcessImpl; // http://crbug.com/125207 211 friend class ::BrowserProcessImpl; // http://crbug.com/125207
210 friend class ::NativeBackendKWallet; // http://crbug.com/125331 212 friend class ::NativeBackendKWallet; // http://crbug.com/125331
211 // END USAGE THAT NEEDS TO BE FIXED. 213 // END USAGE THAT NEEDS TO BE FIXED.
212 214
213 #if ENABLE_THREAD_RESTRICTIONS 215 #if ENABLE_THREAD_RESTRICTIONS
214 static bool SetWaitAllowed(bool allowed); 216 static bool SetWaitAllowed(bool allowed);
215 #else 217 #else
216 static bool SetWaitAllowed(bool allowed) { return true; } 218 static bool SetWaitAllowed(bool allowed) { return true; }
217 #endif 219 #endif
218 220
(...skipping 12 matching lines...) Expand all
231 233
232 DISALLOW_COPY_AND_ASSIGN(ScopedAllowWait); 234 DISALLOW_COPY_AND_ASSIGN(ScopedAllowWait);
233 }; 235 };
234 236
235 DISALLOW_IMPLICIT_CONSTRUCTORS(ThreadRestrictions); 237 DISALLOW_IMPLICIT_CONSTRUCTORS(ThreadRestrictions);
236 }; 238 };
237 239
238 } // namespace base 240 } // namespace base
239 241
240 #endif // BASE_THREADING_THREAD_RESTRICTIONS_H_ 242 #endif // BASE_THREADING_THREAD_RESTRICTIONS_H_
OLDNEW
« no previous file with comments | « base/threading/thread.cc ('k') | base/threading/thread_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698