| Index: chrome/browser/chromeos/cros/cryptohome_library.cc
|
| diff --git a/chrome/browser/chromeos/cros/cryptohome_library.cc b/chrome/browser/chromeos/cros/cryptohome_library.cc
|
| index b67b55f9967dda4d48adfaef8f7ea8ccf71c55fd..f4538328bb7199a2f713e794e3ea9cac09e6a305 100644
|
| --- a/chrome/browser/chromeos/cros/cryptohome_library.cc
|
| +++ b/chrome/browser/chromeos/cros/cryptohome_library.cc
|
| @@ -6,19 +6,23 @@
|
|
|
| #include <map>
|
|
|
| +#include "base/bind.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/string_number_conversions.h"
|
| #include "base/string_util.h"
|
| #include "chromeos/dbus/cryptohome_client.h"
|
| #include "chromeos/dbus/dbus_thread_manager.h"
|
|
|
| +namespace chromeos {
|
| +
|
| namespace {
|
|
|
| const char kStubSystemSalt[] = "stub_system_salt";
|
|
|
| -}
|
| +// Does nothing. Used as a Cryptohome::VoidMethodCallback.
|
| +void DoNothing(DBusMethodCallStatus call_status) {}
|
|
|
| -namespace chromeos {
|
| +} // namespace
|
|
|
| // This class handles the interaction with the ChromeOS cryptohome library APIs.
|
| class CryptohomeLibraryImpl : public CryptohomeLibrary {
|
| @@ -49,7 +53,8 @@ class CryptohomeLibraryImpl : public CryptohomeLibrary {
|
| }
|
|
|
| virtual void TpmCanAttemptOwnership() OVERRIDE {
|
| - DBusThreadManager::Get()->GetCryptohomeClient()->TpmCanAttemptOwnership();
|
| + DBusThreadManager::Get()->GetCryptohomeClient()->TpmCanAttemptOwnership(
|
| + base::Bind(&DoNothing));
|
| }
|
|
|
| virtual void TpmClearStoredPassword() OVERRIDE {
|
|
|