Skip to content

Commit

Permalink
Update TPM dialog text
Browse files Browse the repository at this point in the history
+ 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
  • Loading branch information
dpolukhin@chromium.org committed Sep 19, 2013
1 parent 2ca5bbb commit 30a41e0
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion chrome/app/chromeos_strings.grdp
Original file line number Diff line number Diff line change
Expand Up @@ -1645,7 +1645,7 @@ Press any key to continue exploring.
System installation settings
</message>
<message name="IDS_EULA_TPM_DESCRIPTION" desc="Dialog box text">
Your computer contains a Trusted Platform Module (TPM) security device, which is used to implement many critical security features in Chrome OS.
Your computer contains a Trusted Platform Module (TPM) security device, which is used to implement many critical security features in Chrome OS. Visit the Chromebook Help Center to learn more: http://support.google.com/chromebook/?p=tpm
</message>
<message name="IDS_EULA_TPM_KEY_DESCRIPTION" desc="Dialog box text">
Below is the randomly generated TPM password that has been assigned to your computer:
Expand Down
3 changes: 2 additions & 1 deletion chromeos/dbus/cryptohome_client_stub.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down

0 comments on commit 30a41e0

Please sign in to comment.