Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1280)

Unified Diff: chrome/browser/ui/webui/settings/certificates_handler.cc

Issue 2792573002: Remove base::Value::CreateNullValue (Closed)
Patch Set: Rebase Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/settings/certificates_handler.cc
diff --git a/chrome/browser/ui/webui/settings/certificates_handler.cc b/chrome/browser/ui/webui/settings/certificates_handler.cc
index 8df717242a1a0f92a7d863018cce2b9b29e64cdd..9930c7b9bc9ca67a79b9efd091f6193807261e89 100644
--- a/chrome/browser/ui/webui/settings/certificates_handler.cc
+++ b/chrome/browser/ui/webui/settings/certificates_handler.cc
@@ -458,7 +458,7 @@ void CertificatesHandler::FileSelectionCanceled(void* params) {
case IMPORT_SERVER_FILE_SELECTED:
case IMPORT_CA_FILE_SELECTED:
ImportExportCleanup();
- RejectCallback(*base::Value::CreateNullValue());
+ RejectCallback(base::Value());
break;
default:
NOTREACHED();
@@ -541,7 +541,7 @@ void CertificatesHandler::HandleEditCATrust(const base::ListValue* args) {
l10n_util::GetStringUTF8(
IDS_SETTINGS_CERTIFICATE_MANAGER_UNKNOWN_ERROR));
} else {
- ResolveCallback(*base::Value::CreateNullValue());
+ ResolveCallback(base::Value());
}
}
@@ -573,7 +573,7 @@ void CertificatesHandler::HandleExportPersonal(const base::ListValue* args) {
void CertificatesHandler::ExportPersonalFileSelected(
const base::FilePath& path) {
file_path_ = path;
- ResolveCallback(*base::Value::CreateNullValue());
+ ResolveCallback(base::Value());
}
void CertificatesHandler::HandleExportPersonalPasswordSelected(
@@ -627,7 +627,7 @@ void CertificatesHandler::ExportPersonalFileWritten(const int* write_errno,
IDS_SETTINGS_CERTIFICATE_MANAGER_WRITE_ERROR_FORMAT,
UTF8ToUTF16(base::safe_strerror(*write_errno))));
} else {
- ResolveCallback(*base::Value::CreateNullValue());
+ ResolveCallback(base::Value());
}
}
@@ -743,7 +743,7 @@ void CertificatesHandler::ImportPersonalSlotUnlocked() {
int string_id;
switch (result) {
case net::OK:
- ResolveCallback(*base::Value::CreateNullValue());
+ ResolveCallback(base::Value());
return;
case net::ERR_PKCS12_IMPORT_BAD_PASSWORD:
// TODO(mattm): if the error was a bad password, we should reshow the
@@ -850,7 +850,7 @@ void CertificatesHandler::ImportServerFileRead(const int* read_errno,
IDS_SETTINGS_CERTIFICATE_MANAGER_SERVER_IMPORT_ERROR_TITLE),
not_imported);
} else {
- ResolveCallback(*base::Value::CreateNullValue());
+ ResolveCallback(base::Value());
}
ImportExportCleanup();
}
@@ -942,7 +942,7 @@ void CertificatesHandler::HandleImportCATrustSelected(
IDS_SETTINGS_CERTIFICATE_MANAGER_CA_IMPORT_ERROR_TITLE),
not_imported);
} else {
- ResolveCallback(*base::Value::CreateNullValue());
+ ResolveCallback(base::Value());
}
ImportExportCleanup();
}
@@ -972,7 +972,7 @@ void CertificatesHandler::HandleDeleteCertificate(const base::ListValue* args) {
l10n_util::GetStringUTF8(
IDS_SETTINGS_CERTIFICATE_MANAGER_UNKNOWN_ERROR));
} else {
- ResolveCallback(*base::Value::CreateNullValue());
+ ResolveCallback(base::Value());
}
}
« no previous file with comments | « chrome/browser/ui/webui/settings/about_handler.cc ('k') | chrome/browser/ui/webui/settings/on_startup_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698