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 393 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
404 void OnMountExCallback(const MountCallback& callback, | 404 void OnMountExCallback(const MountCallback& callback, |
405 chromeos::DBusMethodCallStatus call_status, | 405 chromeos::DBusMethodCallStatus call_status, |
406 bool result, | 406 bool result, |
407 const BaseReply& reply) { | 407 const BaseReply& reply) { |
408 if (call_status != chromeos::DBUS_METHOD_CALL_SUCCESS) { | 408 if (call_status != chromeos::DBUS_METHOD_CALL_SUCCESS) { |
409 callback.Run(false, MOUNT_ERROR_FATAL, std::string()); | 409 callback.Run(false, MOUNT_ERROR_FATAL, std::string()); |
410 return; | 410 return; |
411 } | 411 } |
412 if (reply.has_error()) { | 412 if (reply.has_error()) { |
413 if (reply.error() != CRYPTOHOME_ERROR_NOT_SET) { | 413 if (reply.error() != CRYPTOHOME_ERROR_NOT_SET) { |
414 LOGIN_LOG(ERROR) << "HomedirMethods MountEx error: " << reply.error(); | 414 LOGIN_LOG(ERROR) |
| 415 << "HomedirMethods MountEx error (CryptohomeErrorCode): " |
| 416 << reply.error(); |
415 callback.Run(false, MapError(reply.error()), std::string()); | 417 callback.Run(false, MapError(reply.error()), std::string()); |
416 return; | 418 return; |
417 } | 419 } |
418 } | 420 } |
419 if (!reply.HasExtension(MountReply::reply)) { | 421 if (!reply.HasExtension(MountReply::reply)) { |
420 callback.Run(false, MOUNT_ERROR_FATAL, std::string()); | 422 callback.Run(false, MOUNT_ERROR_FATAL, std::string()); |
421 return; | 423 return; |
422 } | 424 } |
423 | 425 |
424 std::string mount_hash; | 426 std::string mount_hash; |
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
507 } | 509 } |
508 delete g_homedir_methods; | 510 delete g_homedir_methods; |
509 g_homedir_methods = NULL; | 511 g_homedir_methods = NULL; |
510 VLOG(1) << "HomedirMethods Shutdown completed"; | 512 VLOG(1) << "HomedirMethods Shutdown completed"; |
511 } | 513 } |
512 | 514 |
513 // static | 515 // static |
514 HomedirMethods* HomedirMethods::GetInstance() { return g_homedir_methods; } | 516 HomedirMethods* HomedirMethods::GetInstance() { return g_homedir_methods; } |
515 | 517 |
516 } // namespace cryptohome | 518 } // namespace cryptohome |
OLD | NEW |