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/cryptohome/async_method_caller.h" | 5 #include "chromeos/cryptohome/async_method_caller.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/containers/hash_tables.h" | 8 #include "base/containers/hash_tables.h" |
9 #include "base/location.h" | 9 #include "base/location.h" |
| 10 #include "base/macros.h" |
10 #include "base/single_thread_task_runner.h" | 11 #include "base/single_thread_task_runner.h" |
11 #include "base/thread_task_runner_handle.h" | 12 #include "base/thread_task_runner_handle.h" |
12 #include "chromeos/dbus/dbus_thread_manager.h" | 13 #include "chromeos/dbus/dbus_thread_manager.h" |
13 | 14 |
14 using chromeos::DBusThreadManager; | 15 using chromeos::DBusThreadManager; |
15 | 16 |
16 namespace cryptohome { | 17 namespace cryptohome { |
17 | 18 |
18 namespace { | 19 namespace { |
19 | 20 |
(...skipping 367 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
387 g_async_method_caller = NULL; | 388 g_async_method_caller = NULL; |
388 VLOG(1) << "AsyncMethodCaller Shutdown completed"; | 389 VLOG(1) << "AsyncMethodCaller Shutdown completed"; |
389 } | 390 } |
390 | 391 |
391 // static | 392 // static |
392 AsyncMethodCaller* AsyncMethodCaller::GetInstance() { | 393 AsyncMethodCaller* AsyncMethodCaller::GetInstance() { |
393 return g_async_method_caller; | 394 return g_async_method_caller; |
394 } | 395 } |
395 | 396 |
396 } // namespace cryptohome | 397 } // namespace cryptohome |
OLD | NEW |