OLD | NEW |
---|---|
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/macros.h" | 9 #include "base/macros.h" |
10 | 10 |
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
58 } | 58 } |
59 namespace mojo { | 59 namespace mojo { |
60 namespace common { | 60 namespace common { |
61 class MessagePumpMojo; | 61 class MessagePumpMojo; |
62 } | 62 } |
63 class SyncCallRestrictions; | 63 class SyncCallRestrictions; |
64 } | 64 } |
65 namespace mus { | 65 namespace mus { |
66 class CommandBufferClientImpl; | 66 class CommandBufferClientImpl; |
67 class CommandBufferLocal; | 67 class CommandBufferLocal; |
68 class GpuService; | |
68 class GpuState; | 69 class GpuState; |
69 } | 70 } |
70 namespace net { | 71 namespace net { |
71 class NetworkChangeNotifierMac; | 72 class NetworkChangeNotifierMac; |
72 namespace internal { | 73 namespace internal { |
73 class AddressTrackerLinux; | 74 class AddressTrackerLinux; |
74 } | 75 } |
75 } | 76 } |
76 | 77 |
77 namespace remoting { | 78 namespace remoting { |
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
208 friend class SequencedWorkerPool; | 209 friend class SequencedWorkerPool; |
209 friend class SimpleThread; | 210 friend class SimpleThread; |
210 friend class Thread; | 211 friend class Thread; |
211 friend class ThreadTestHelper; | 212 friend class ThreadTestHelper; |
212 friend class PlatformThread; | 213 friend class PlatformThread; |
213 friend class android::JavaHandlerThread; | 214 friend class android::JavaHandlerThread; |
214 friend class mojo::common::MessagePumpMojo; | 215 friend class mojo::common::MessagePumpMojo; |
215 friend class mojo::SyncCallRestrictions; | 216 friend class mojo::SyncCallRestrictions; |
216 friend class mus::CommandBufferClientImpl; | 217 friend class mus::CommandBufferClientImpl; |
217 friend class mus::CommandBufferLocal; | 218 friend class mus::CommandBufferLocal; |
219 friend class mus::GpuService; // http://crbug.com/620058 | |
jam
2016/06/22 23:55:50
is this a bad merge? you need to remove this from
Peng
2016/06/23 14:15:57
Done.
| |
218 friend class mus::GpuState; | 220 friend class mus::GpuState; |
219 | 221 |
220 // END ALLOWED USAGE. | 222 // END ALLOWED USAGE. |
221 // BEGIN USAGE THAT NEEDS TO BE FIXED. | 223 // BEGIN USAGE THAT NEEDS TO BE FIXED. |
222 friend class ::chromeos::BlockingMethodCaller; // http://crbug.com/125360 | 224 friend class ::chromeos::BlockingMethodCaller; // http://crbug.com/125360 |
223 friend class ::chromeos::system::StatisticsProviderImpl; // http://crbug.com/ 125385 | 225 friend class ::chromeos::system::StatisticsProviderImpl; // http://crbug.com/ 125385 |
224 friend class chrome_browser_net::Predictor; // http://crbug.com/78451 | 226 friend class chrome_browser_net::Predictor; // http://crbug.com/78451 |
225 friend class | 227 friend class |
226 content::BrowserGpuChannelHostFactory; // http://crbug.com/125248 | 228 content::BrowserGpuChannelHostFactory; // http://crbug.com/125248 |
227 friend class | 229 friend class |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
266 | 268 |
267 DISALLOW_COPY_AND_ASSIGN(ScopedAllowWait); | 269 DISALLOW_COPY_AND_ASSIGN(ScopedAllowWait); |
268 }; | 270 }; |
269 | 271 |
270 DISALLOW_IMPLICIT_CONSTRUCTORS(ThreadRestrictions); | 272 DISALLOW_IMPLICIT_CONSTRUCTORS(ThreadRestrictions); |
271 }; | 273 }; |
272 | 274 |
273 } // namespace base | 275 } // namespace base |
274 | 276 |
275 #endif // BASE_THREADING_THREAD_RESTRICTIONS_H_ | 277 #endif // BASE_THREADING_THREAD_RESTRICTIONS_H_ |
OLD | NEW |