diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-11-28 16:14:41 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-12-13 15:19:41 +0000 |
commit | 61d9742824d54be5693191fe502325a909feca59 (patch) | |
tree | cbf28e779b11338fe52eb75b915684cd8955542c /chromium/chrome/browser/extensions/api/omnibox/omnibox_api.cc | |
parent | 45f9ded08bb7526984b24ccb5a5327aaf6821676 (diff) |
BASELINE: Update Chromium to 108.0.5359.70
Change-Id: I77334ff232b819600f275bd3cfe41fbaa3619230
Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/445904
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/chrome/browser/extensions/api/omnibox/omnibox_api.cc')
-rw-r--r-- | chromium/chrome/browser/extensions/api/omnibox/omnibox_api.cc | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/chromium/chrome/browser/extensions/api/omnibox/omnibox_api.cc b/chromium/chrome/browser/extensions/api/omnibox/omnibox_api.cc index 39df08f5e0f..6c0366df334 100644 --- a/chromium/chrome/browser/extensions/api/omnibox/omnibox_api.cc +++ b/chromium/chrome/browser/extensions/api/omnibox/omnibox_api.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2012 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -52,7 +52,7 @@ std::unique_ptr<omnibox::SuggestResult> GetOmniboxDefaultSuggestion( ExtensionPrefs* prefs = ExtensionPrefs::Get(profile); std::unique_ptr<omnibox::SuggestResult> suggestion; - const base::DictionaryValue* dict = NULL; + const base::DictionaryValue* dict = nullptr; if (prefs && prefs->ReadPrefAsDictionary(extension_id, kOmniboxDefaultSuggestion, &dict)) { @@ -72,12 +72,13 @@ bool SetOmniboxDefaultSuggestion( if (!prefs) return false; - std::unique_ptr<base::DictionaryValue> dict = suggestion.ToValue(); + base::Value::Dict dict = suggestion.ToValue(); // Add the content field so that the dictionary can be used to populate an // omnibox::SuggestResult. - dict->SetKey(kSuggestionContent, base::Value(base::Value::Type::STRING)); - prefs->UpdateExtensionPref(extension_id, kOmniboxDefaultSuggestion, - std::move(dict)); + dict.Set(kSuggestionContent, base::Value(base::Value::Type::STRING)); + prefs->UpdateExtensionPref( + extension_id, kOmniboxDefaultSuggestion, + base::Value::ToUniquePtrValue(base::Value(std::move(dict)))); return true; } @@ -324,8 +325,7 @@ void OmniboxSendSuggestionsFunction::OnParsedDescriptionsAndStyles( params_->suggest_results[i].description = base::UTF16ToUTF8(result.descriptions_and_styles[i].description); params_->suggest_results[i].description_styles = - std::make_unique<std::vector<api::omnibox::MatchClassification>>( - std::move(result.descriptions_and_styles[i].styles)); + std::move(result.descriptions_and_styles[i].styles); } NotifySuggestionsReady(); @@ -369,8 +369,7 @@ void OmniboxSetDefaultSuggestionFunction::OnParsedDescriptionAndStyles( omnibox::DefaultSuggestResult default_suggestion; default_suggestion.description = base::UTF16ToUTF8(single_result.description); - default_suggestion.description_styles = - std::make_unique<std::vector<api::omnibox::MatchClassification>>(); + default_suggestion.description_styles.emplace(); default_suggestion.description_styles->swap(single_result.styles); SetDefaultSuggestion(default_suggestion); Respond(NoArguments()); |