diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
| commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
| tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/chrome/browser/ui/webui/omnibox | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
| download | qtwebengine-chromium-85-based.tar.gz | |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/chrome/browser/ui/webui/omnibox')
| -rw-r--r-- | chromium/chrome/browser/ui/webui/omnibox/omnibox_page_handler.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chromium/chrome/browser/ui/webui/omnibox/omnibox_page_handler.cc b/chromium/chrome/browser/ui/webui/omnibox/omnibox_page_handler.cc index c6e3c553d56..bb23cde4f20 100644 --- a/chromium/chrome/browser/ui/webui/omnibox/omnibox_page_handler.cc +++ b/chromium/chrome/browser/ui/webui/omnibox/omnibox_page_handler.cc @@ -128,7 +128,7 @@ template <> struct TypeConverter<mojom::AutocompleteMatchPtr, AutocompleteMatch> { static mojom::AutocompleteMatchPtr Convert(const AutocompleteMatch& input) { mojom::AutocompleteMatchPtr result(mojom::AutocompleteMatch::New()); - if (input.provider != NULL) { + if (input.provider) { result->provider_name = std::string(input.provider->GetName()); result->provider_done = input.provider->done(); } @@ -162,7 +162,7 @@ struct TypeConverter<mojom::AutocompleteMatchPtr, AutocompleteMatch> { result->type = AutocompleteMatchType::ToString(input.type); result->is_search_type = AutocompleteMatch::IsSearchType(input.type); result->has_tab_match = input.has_tab_match; - if (input.associated_keyword.get() != NULL) { + if (input.associated_keyword.get()) { result->associated_keyword = base::UTF16ToUTF8(input.associated_keyword->keyword); } |