| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/homedir_methods.h" | 5 #include "chromeos/cryptohome/homedir_methods.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| 11 #include "base/logging.h" | 11 #include "base/logging.h" |
| 12 #include "base/macros.h" | 12 #include "base/macros.h" |
| 13 #include "chromeos/dbus/cryptohome/key.pb.h" | 13 #include "chromeos/dbus/cryptohome/key.pb.h" |
| 14 #include "chromeos/dbus/cryptohome/rpc.pb.h" | 14 #include "chromeos/dbus/cryptohome/rpc.pb.h" |
| 15 #include "chromeos/dbus/dbus_thread_manager.h" | 15 #include "chromeos/dbus/dbus_thread_manager.h" |
| 16 #include "components/device_event_log/device_event_log.h" | 16 #include "components/device_event_log/device_event_log.h" |
| 17 | |
| 18 #if defined(USE_SYSTEM_PROTOBUF) | |
| 19 #include <google/protobuf/repeated_field.h> | |
| 20 #else | |
| 21 #include "third_party/protobuf/src/google/protobuf/repeated_field.h" | 17 #include "third_party/protobuf/src/google/protobuf/repeated_field.h" |
| 22 #endif | |
| 23 | 18 |
| 24 using chromeos::DBusThreadManager; | 19 using chromeos::DBusThreadManager; |
| 25 using google::protobuf::RepeatedPtrField; | 20 using google::protobuf::RepeatedPtrField; |
| 26 | 21 |
| 27 namespace cryptohome { | 22 namespace cryptohome { |
| 28 | 23 |
| 29 namespace { | 24 namespace { |
| 30 | 25 |
| 31 HomedirMethods* g_homedir_methods = NULL; | 26 HomedirMethods* g_homedir_methods = NULL; |
| 32 | 27 |
| (...skipping 478 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 511 } | 506 } |
| 512 delete g_homedir_methods; | 507 delete g_homedir_methods; |
| 513 g_homedir_methods = NULL; | 508 g_homedir_methods = NULL; |
| 514 VLOG(1) << "HomedirMethods Shutdown completed"; | 509 VLOG(1) << "HomedirMethods Shutdown completed"; |
| 515 } | 510 } |
| 516 | 511 |
| 517 // static | 512 // static |
| 518 HomedirMethods* HomedirMethods::GetInstance() { return g_homedir_methods; } | 513 HomedirMethods* HomedirMethods::GetInstance() { return g_homedir_methods; } |
| 519 | 514 |
| 520 } // namespace cryptohome | 515 } // namespace cryptohome |
| OLD | NEW |