| 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" |
| (...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 154 case CRYPTOHOME_ERROR_TPM_DEFEND_LOCK: | 154 case CRYPTOHOME_ERROR_TPM_DEFEND_LOCK: |
| 155 return MOUNT_ERROR_TPM_DEFEND_LOCK; | 155 return MOUNT_ERROR_TPM_DEFEND_LOCK; |
| 156 case CRYPTOHOME_ERROR_MOUNT_MOUNT_POINT_BUSY: | 156 case CRYPTOHOME_ERROR_MOUNT_MOUNT_POINT_BUSY: |
| 157 return MOUNT_ERROR_MOUNT_POINT_BUSY; | 157 return MOUNT_ERROR_MOUNT_POINT_BUSY; |
| 158 case CRYPTOHOME_ERROR_TPM_NEEDS_REBOOT: | 158 case CRYPTOHOME_ERROR_TPM_NEEDS_REBOOT: |
| 159 return MOUNT_ERROR_TPM_NEEDS_REBOOT; | 159 return MOUNT_ERROR_TPM_NEEDS_REBOOT; |
| 160 case CRYPTOHOME_ERROR_AUTHORIZATION_KEY_DENIED: | 160 case CRYPTOHOME_ERROR_AUTHORIZATION_KEY_DENIED: |
| 161 case CRYPTOHOME_ERROR_KEY_LABEL_EXISTS: | 161 case CRYPTOHOME_ERROR_KEY_LABEL_EXISTS: |
| 162 case CRYPTOHOME_ERROR_UPDATE_SIGNATURE_INVALID: | 162 case CRYPTOHOME_ERROR_UPDATE_SIGNATURE_INVALID: |
| 163 return MOUNT_ERROR_KEY_FAILURE; | 163 return MOUNT_ERROR_KEY_FAILURE; |
| 164 case CRYPTOHOME_ERROR_MOUNT_OLD_ENCRYPTION: |
| 165 return MOUNT_ERROR_OLD_ENCRYPTION; |
| 166 case CRYPTOHOME_ERROR_MOUNT_PREVIOUS_MIGRATION_INCOMPLETE: |
| 167 return MOUNT_ERROR_PREVIOUS_MIGRATION_INCOMPLETE; |
| 164 default: | 168 default: |
| 165 NOTREACHED(); | 169 NOTREACHED(); |
| 166 return MOUNT_ERROR_FATAL; | 170 return MOUNT_ERROR_FATAL; |
| 167 } | 171 } |
| 168 } | 172 } |
| 169 | 173 |
| 170 // The implementation of HomedirMethods | 174 // The implementation of HomedirMethods |
| 171 class HomedirMethodsImpl : public HomedirMethods { | 175 class HomedirMethodsImpl : public HomedirMethods { |
| 172 public: | 176 public: |
| 173 HomedirMethodsImpl() : weak_ptr_factory_(this) {} | 177 HomedirMethodsImpl() : weak_ptr_factory_(this) {} |
| (...skipping 316 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 490 } | 494 } |
| 491 delete g_homedir_methods; | 495 delete g_homedir_methods; |
| 492 g_homedir_methods = NULL; | 496 g_homedir_methods = NULL; |
| 493 VLOG(1) << "HomedirMethods Shutdown completed"; | 497 VLOG(1) << "HomedirMethods Shutdown completed"; |
| 494 } | 498 } |
| 495 | 499 |
| 496 // static | 500 // static |
| 497 HomedirMethods* HomedirMethods::GetInstance() { return g_homedir_methods; } | 501 HomedirMethods* HomedirMethods::GetInstance() { return g_homedir_methods; } |
| 498 | 502 |
| 499 } // namespace cryptohome | 503 } // namespace cryptohome |
| OLD | NEW |