| 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 #include "chromeos/dbus/blocking_method_caller.h" | 5 #include "chromeos/dbus/blocking_method_caller.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/callback_helpers.h" |
| 8 #include "base/location.h" | 9 #include "base/location.h" |
| 9 #include "base/threading/thread_restrictions.h" | 10 #include "base/threading/thread_restrictions.h" |
| 10 #include "dbus/bus.h" | 11 #include "dbus/bus.h" |
| 11 #include "dbus/object_proxy.h" | 12 #include "dbus/object_proxy.h" |
| 12 | 13 |
| 13 namespace chromeos { | 14 namespace chromeos { |
| 14 | 15 |
| 15 namespace { | 16 namespace { |
| 16 | 17 |
| 17 // This function is a part of CallMethodAndBlock implementation. | 18 // This function is a part of CallMethodAndBlock implementation. |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 55 base::Owned(signaler), | 56 base::Owned(signaler), |
| 56 base::Unretained(proxy_), | 57 base::Unretained(proxy_), |
| 57 method_call)); | 58 method_call)); |
| 58 // http://crbug.com/125360 | 59 // http://crbug.com/125360 |
| 59 base::ThreadRestrictions::ScopedAllowWait allow_wait; | 60 base::ThreadRestrictions::ScopedAllowWait allow_wait; |
| 60 on_blocking_method_call_.Wait(); | 61 on_blocking_method_call_.Wait(); |
| 61 return response.Pass(); | 62 return response.Pass(); |
| 62 } | 63 } |
| 63 | 64 |
| 64 } // namespace chromeos | 65 } // namespace chromeos |
| OLD | NEW |