diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-05-03 13:42:47 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-05-15 10:27:51 +0000 |
commit | 8c5c43c7b138c9b4b0bf56d946e61d3bbc111bec (patch) | |
tree | d29d987c4d7b173cf853279b79a51598f104b403 /chromium/components/error_page | |
parent | 830c9e163d31a9180fadca926b3e1d7dfffb5021 (diff) | |
download | qtwebengine-chromium-8c5c43c7b138c9b4b0bf56d946e61d3bbc111bec.tar.gz |
BASELINE: Update Chromium to 66.0.3359.156
Change-Id: I0c9831ad39911a086b6377b16f995ad75a51e441
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'chromium/components/error_page')
-rw-r--r-- | chromium/components/error_page/common/localized_error.cc | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/chromium/components/error_page/common/localized_error.cc b/chromium/components/error_page/common/localized_error.cc index ddf472aeccf..aff41dbc7aa 100644 --- a/chromium/components/error_page/common/localized_error.cc +++ b/chromium/components/error_page/common/localized_error.cc @@ -6,6 +6,7 @@ #include <stddef.h> +#include <memory> #include <utility> #include "base/command_line.h" @@ -535,7 +536,7 @@ void AddSingleEntryDictionaryToList(base::ListValue* list, const char* path, int message_id, bool insert_as_first_item) { - auto suggestion_list_item = base::MakeUnique<base::DictionaryValue>(); + auto suggestion_list_item = std::make_unique<base::DictionaryValue>(); suggestion_list_item->SetString(path, l10n_util::GetStringUTF16(message_id)); if (insert_as_first_item) { @@ -657,7 +658,7 @@ void GetSuggestionsSummaryList(int error_code, if (failed_origin.unique()) return; - auto suggestion = base::MakeUnique<base::DictionaryValue>(); + auto suggestion = std::make_unique<base::DictionaryValue>(); suggestion->SetString("summary", l10n_util::GetStringUTF16( IDS_ERRORPAGES_SUGGESTION_NAVIGATE_TO_ORIGIN)); @@ -911,13 +912,13 @@ void LocalizedError::GetStrings( std::string icon_class = GetIconClassForError(error_domain, error_code); error_strings->SetString("iconClass", icon_class); - auto heading = base::MakeUnique<base::DictionaryValue>(); + auto heading = std::make_unique<base::DictionaryValue>(); heading->SetString("msg", l10n_util::GetStringUTF16(options.heading_resource_id)); heading->SetString("hostName", host_name); error_strings->Set("heading", std::move(heading)); - auto summary = base::MakeUnique<base::DictionaryValue>(); + auto summary = std::make_unique<base::DictionaryValue>(); // Set summary message under the heading. summary->SetString( @@ -970,9 +971,9 @@ void LocalizedError::GetStrings( if (!params->override_suggestions) { // Detailed suggestion information. suggestions_details = error_strings->SetList( - "suggestionsDetails", base::MakeUnique<base::ListValue>()); + "suggestionsDetails", std::make_unique<base::ListValue>()); suggestions_summary_list = error_strings->SetList( - "suggestionsSummaryList", base::MakeUnique<base::ListValue>()); + "suggestionsSummaryList", std::make_unique<base::ListValue>()); } else { suggestions_summary_list = error_strings->SetList( "suggestionsSummaryList", std::move(params->override_suggestions)); @@ -1002,7 +1003,7 @@ void LocalizedError::GetStrings( #if defined(OS_ANDROID) reload_visible = true; #endif // defined(OS_ANDROID) - auto reload_button = base::MakeUnique<base::DictionaryValue>(); + auto reload_button = std::make_unique<base::DictionaryValue>(); reload_button->SetString( "msg", l10n_util::GetStringUTF16(IDS_ERRORPAGES_BUTTON_RELOAD)); reload_button->SetString("reloadUrl", failed_url.spec()); @@ -1041,7 +1042,7 @@ void LocalizedError::GetStrings( (show_saved_copy_primary || show_saved_copy_secondary)); if (show_saved_copy_visible) { - auto show_saved_copy_button = base::MakeUnique<base::DictionaryValue>(); + auto show_saved_copy_button = std::make_unique<base::DictionaryValue>(); show_saved_copy_button->SetString( "msg", l10n_util::GetStringUTF16( IDS_ERRORPAGES_BUTTON_SHOW_SAVED_COPY)); @@ -1060,7 +1061,7 @@ void LocalizedError::GetStrings( failed_url.SchemeIsHTTPOrHTTPS() && IsSuggested(options.suggestions, SUGGEST_OFFLINE_CHECKS)) { std::unique_ptr<base::DictionaryValue> download_button = - base::MakeUnique<base::DictionaryValue>(); + std::make_unique<base::DictionaryValue>(); download_button->SetString( "msg", l10n_util::GetStringUTF16(IDS_ERRORPAGES_BUTTON_DOWNLOAD)); |