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 PPAPI_SHARED_IMPL_PROXY_LOCK_H_ | 5 #ifndef PPAPI_SHARED_IMPL_PROXY_LOCK_H_ |
6 #define PPAPI_SHARED_IMPL_PROXY_LOCK_H_ | 6 #define PPAPI_SHARED_IMPL_PROXY_LOCK_H_ |
7 | 7 |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/basictypes.h" | |
11 #include "base/bind.h" | 10 #include "base/bind.h" |
12 #include "base/callback.h" | 11 #include "base/callback.h" |
| 12 #include "base/macros.h" |
13 #include "base/memory/scoped_ptr.h" | 13 #include "base/memory/scoped_ptr.h" |
14 #include "base/threading/thread_checker.h" | 14 #include "base/threading/thread_checker.h" |
15 #include "ppapi/shared_impl/ppapi_shared_export.h" | 15 #include "ppapi/shared_impl/ppapi_shared_export.h" |
16 | 16 |
17 namespace base { | 17 namespace base { |
18 class Lock; | 18 class Lock; |
19 } | 19 } |
20 | 20 |
21 namespace content { | 21 namespace content { |
22 class HostGlobals; | 22 class HostGlobals; |
(...skipping 354 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
377 scoped_ptr<internal::RunWhileLockedHelper<FunctionType>> helper( | 377 scoped_ptr<internal::RunWhileLockedHelper<FunctionType>> helper( |
378 new internal::RunWhileLockedHelper<FunctionType>(callback)); | 378 new internal::RunWhileLockedHelper<FunctionType>(callback)); |
379 return base::Bind( | 379 return base::Bind( |
380 &internal::RunWhileLockedHelper<FunctionType>::CallWhileLocked, | 380 &internal::RunWhileLockedHelper<FunctionType>::CallWhileLocked, |
381 base::Passed(std::move(helper))); | 381 base::Passed(std::move(helper))); |
382 } | 382 } |
383 | 383 |
384 } // namespace ppapi | 384 } // namespace ppapi |
385 | 385 |
386 #endif // PPAPI_SHARED_IMPL_PROXY_LOCK_H_ | 386 #endif // PPAPI_SHARED_IMPL_PROXY_LOCK_H_ |
OLD | NEW |