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

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

Issue 1472873003: Revert of views/mus: Fix showing menu in chrome in mus. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 | « no previous file | chrome/browser/ui/views/chrome_views_delegate.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 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 } 68 }
69 69
70 namespace remoting { 70 namespace remoting {
71 class AutoThread; 71 class AutoThread;
72 } 72 }
73 73
74 namespace ui { 74 namespace ui {
75 class WindowResizeHelperMac; 75 class WindowResizeHelperMac;
76 } 76 }
77 77
78 namespace views {
79 class WindowManagerConnection;
80 }
81
82 namespace base { 78 namespace base {
83 79
84 namespace android { 80 namespace android {
85 class JavaHandlerThread; 81 class JavaHandlerThread;
86 } 82 }
87 83
88 class SequencedWorkerPool; 84 class SequencedWorkerPool;
89 class SimpleThread; 85 class SimpleThread;
90 class Thread; 86 class Thread;
91 class ThreadTestHelper; 87 class ThreadTestHelper;
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 friend class content::TextInputClientMac; // http://crbug.com/121917 213 friend class content::TextInputClientMac; // http://crbug.com/121917
218 friend class dbus::Bus; // http://crbug.com/125222 214 friend class dbus::Bus; // http://crbug.com/125222
219 friend class disk_cache::BackendImpl; // http://crbug.com/74623 215 friend class disk_cache::BackendImpl; // http://crbug.com/74623
220 friend class disk_cache::InFlightIO; // http://crbug.com/74623 216 friend class disk_cache::InFlightIO; // http://crbug.com/74623
221 friend class net::internal::AddressTrackerLinux; // http://crbug.com/125097 217 friend class net::internal::AddressTrackerLinux; // http://crbug.com/125097
222 friend class net::NetworkChangeNotifierMac; // http://crbug.com/125097 218 friend class net::NetworkChangeNotifierMac; // http://crbug.com/125097
223 friend class ::BrowserProcessImpl; // http://crbug.com/125207 219 friend class ::BrowserProcessImpl; // http://crbug.com/125207
224 friend class ::NativeBackendKWallet; // http://crbug.com/125331 220 friend class ::NativeBackendKWallet; // http://crbug.com/125331
225 #if !defined(OFFICIAL_BUILD) 221 #if !defined(OFFICIAL_BUILD)
226 friend class content::SoftwareOutputDeviceMus; // Interim non-production code 222 friend class content::SoftwareOutputDeviceMus; // Interim non-production code
227 friend class views::WindowManagerConnection;
228 #endif 223 #endif
229 // END USAGE THAT NEEDS TO BE FIXED. 224 // END USAGE THAT NEEDS TO BE FIXED.
230 225
231 #if ENABLE_THREAD_RESTRICTIONS 226 #if ENABLE_THREAD_RESTRICTIONS
232 static bool SetWaitAllowed(bool allowed); 227 static bool SetWaitAllowed(bool allowed);
233 #else 228 #else
234 static bool SetWaitAllowed(bool allowed) { return true; } 229 static bool SetWaitAllowed(bool allowed) { return true; }
235 #endif 230 #endif
236 231
237 // Constructing a ScopedAllowWait temporarily allows waiting on the current 232 // Constructing a ScopedAllowWait temporarily allows waiting on the current
(...skipping 11 matching lines...) Expand all
249 244
250 DISALLOW_COPY_AND_ASSIGN(ScopedAllowWait); 245 DISALLOW_COPY_AND_ASSIGN(ScopedAllowWait);
251 }; 246 };
252 247
253 DISALLOW_IMPLICIT_CONSTRUCTORS(ThreadRestrictions); 248 DISALLOW_IMPLICIT_CONSTRUCTORS(ThreadRestrictions);
254 }; 249 };
255 250
256 } // namespace base 251 } // namespace base
257 252
258 #endif // BASE_THREADING_THREAD_RESTRICTIONS_H_ 253 #endif // BASE_THREADING_THREAD_RESTRICTIONS_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/views/chrome_views_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698