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 89edbb77eef7dd120ff126379f17a9b0e2cf25f2..bf7e29c3c97574434c70f5a74cb87f491e8b974f 100644 |
--- a/chrome/browser/ui/webui/options/certificate_manager_handler.cc |
+++ b/chrome/browser/ui/webui/options/certificate_manager_handler.cc |
@@ -11,6 +11,7 @@ |
#include <algorithm> |
#include <map> |
#include <utility> |
+#include <vector> |
#include "base/bind.h" |
#include "base/bind_helpers.h" |
@@ -18,7 +19,7 @@ |
#include "base/i18n/string_compare.h" |
#include "base/id_map.h" |
#include "base/macros.h" |
-#include "base/memory/scoped_vector.h" |
+#include "base/memory/ptr_util.h" |
#include "base/posix/safe_strerror.h" |
#include "base/strings/string_number_conversions.h" |
#include "base/strings/utf_string_conversions.h" |
@@ -1192,14 +1193,18 @@ void CertificateManagerHandler::PopulateTree( |
void CertificateManagerHandler::ShowError(const std::string& title, |
const std::string& error) const { |
- ScopedVector<const base::Value> args; |
- args.push_back(new base::StringValue(title)); |
- args.push_back(new base::StringValue(error)); |
- args.push_back(new base::StringValue(l10n_util::GetStringUTF8(IDS_OK))); |
- args.push_back(base::Value::CreateNullValue().release()); // cancelTitle |
- args.push_back(base::Value::CreateNullValue().release()); // okCallback |
- args.push_back(base::Value::CreateNullValue().release()); // cancelCallback |
- web_ui()->CallJavascriptFunctionUnsafe("AlertOverlay.show", args.get()); |
+ auto title_value = base::MakeUnique<base::StringValue>(title); |
+ auto error_value = base::MakeUnique<base::StringValue>(error); |
+ auto ok_title_value = |
+ base::MakeUnique<base::StringValue>(l10n_util::GetStringUTF8(IDS_OK)); |
+ auto cancel_title_value = base::Value::CreateNullValue(); |
+ auto ok_callback_value = base::Value::CreateNullValue(); |
+ auto cancel_callback_value = base::Value::CreateNullValue(); |
+ std::vector<const base::Value*> args = { |
+ title_value.get(), error_value.get(), |
+ ok_title_value.get(), cancel_title_value.get(), |
+ ok_callback_value.get(), cancel_callback_value.get()}; |
stevenjb
2017/01/04 17:56:15
This all seems awkward. Would it make sense to add
Avi (use Gerrit)
2017/01/04 18:44:39
We can't overload just the ListValue, as calling a
|
+ web_ui()->CallJavascriptFunctionUnsafe("AlertOverlay.show", args); |
} |
void CertificateManagerHandler::ShowImportErrors( |