summaryrefslogtreecommitdiffstats
path: root/chromeos
diff options
context:
space:
mode:
authordpolukhin@chromium.org <dpolukhin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-19 05:15:59 +0000
committerdpolukhin@chromium.org <dpolukhin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-19 05:15:59 +0000
commit30a41e05bfe0f3d7ec13270e62cf6961e798b7be (patch)
treea2c81e85601970bb60d8ed4b6279720385ea1c7e /chromeos
parent2ca5bbb57f4af0ff52969ad5d4bf552c1f552b88 (diff)
downloadchromium_src-30a41e05bfe0f3d7ec13270e62cf6961e798b7be.zip
chromium_src-30a41e05bfe0f3d7ec13270e62cf6961e798b7be.tar.gz
chromium_src-30a41e05bfe0f3d7ec13270e62cf6961e798b7be.tar.bz2
Update TPM dialog text
+ Fixed issue with temporary object in CryptohomeClientStubImpl::TpmGetPassword that led to crash on Linux. BUG=284831 TEST=manual Review URL: https://chromiumcodereview.appspot.com/23531065 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@224044 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos')
-rw-r--r--chromeos/dbus/cryptohome_client_stub.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/chromeos/dbus/cryptohome_client_stub.cc b/chromeos/dbus/cryptohome_client_stub.cc
index eee96e4..008dbf0 100644
--- a/chromeos/dbus/cryptohome_client_stub.cc
+++ b/chromeos/dbus/cryptohome_client_stub.cc
@@ -139,7 +139,8 @@ void CryptohomeClientStubImpl::TpmGetPassword(
const char kStubTpmPassword[] = "Stub-TPM-password";
base::MessageLoop::current()->PostTask(
FROM_HERE,
- base::Bind(callback, DBUS_METHOD_CALL_SUCCESS, kStubTpmPassword));
+ base::Bind(callback, DBUS_METHOD_CALL_SUCCESS,
+ std::string(kStubTpmPassword)));
}
void CryptohomeClientStubImpl::TpmIsOwned(