| Index: chrome/browser/ui/webui/options/certificate_manager_handler.cc
|
| diff --git a/chrome/browser/ui/webui/options/certificate_manager_handler.cc b/chrome/browser/ui/webui/options/certificate_manager_handler.cc
|
| index fb4fc939163f471fb1e4066aa1108aa7cd2be44e..fe507b519e5cc6789f2086526ebfb0174c8bafb2 100644
|
| --- a/chrome/browser/ui/webui/options/certificate_manager_handler.cc
|
| +++ b/chrome/browser/ui/webui/options/certificate_manager_handler.cc
|
| @@ -466,6 +466,7 @@ void CertificateManagerHandler::GetCATrust(const ListValue* args) {
|
|
|
| int trust = certificate_manager_model_->cert_db().GetCertTrust(
|
| cert, net::CA_CERT);
|
| + using base::FundamentalValue;
|
| FundamentalValue ssl_value(bool(trust & net::CertDatabase::TRUSTED_SSL));
|
| FundamentalValue email_value(bool(trust & net::CertDatabase::TRUSTED_EMAIL));
|
| FundamentalValue obj_sign_value(
|
| @@ -993,7 +994,7 @@ void CertificateManagerHandler::CheckTpmTokenReady(const ListValue* args) {
|
| chromeos::CrosLibrary::Get()->GetCryptohomeLibrary();
|
|
|
| // TODO(xiyuan): Use async way when underlying supports it.
|
| - FundamentalValue ready(cryptohome->Pkcs11IsTpmTokenReady());
|
| + base::FundamentalValue ready(cryptohome->Pkcs11IsTpmTokenReady());
|
| web_ui_->CallJavascriptFunction("CertificateManager.onCheckTpmTokenReady",
|
| ready);
|
| }
|
|
|