Chromium Code Reviews| Index: components/omnibox/browser/bookmark_provider.cc |
| diff --git a/components/omnibox/browser/bookmark_provider.cc b/components/omnibox/browser/bookmark_provider.cc |
| index f9d3bde21f158ce68b65bf99132ee8655ad51fae..e822c8a70594f8cb696309b553702908e1662d78 100644 |
| --- a/components/omnibox/browser/bookmark_provider.cc |
| +++ b/components/omnibox/browser/bookmark_provider.cc |
| @@ -57,11 +57,9 @@ void CorrectTitleAndMatchPositions( |
| BookmarkProvider::BookmarkProvider(AutocompleteProviderClient* client) |
| : AutocompleteProvider(AutocompleteProvider::TYPE_BOOKMARK), |
| client_(client), |
| - bookmark_model_(NULL) { |
| - if (client_) { |
| + bookmark_model_(nullptr) { |
|
Peter Kasting
2016/04/05 02:42:32
Nit: Eliminates need for function body:
boo
jungshik at Google
2016/04/05 18:56:18
Done.
|
| + if (client_) |
| bookmark_model_ = client_->GetBookmarkModel(); |
| - languages_ = client_->GetAcceptLanguages(); |
| - } |
| } |
| void BookmarkProvider::Start(const AutocompleteInput& input, |
| @@ -192,8 +190,8 @@ AutocompleteMatch BookmarkProvider::BookmarkMatchToACMatch( |
| // end. |
| offsets.push_back(inline_autocomplete_offset); |
| match.contents = url_formatter::FormatUrlWithOffsets( |
| - url, languages_, url_formatter::kFormatUrlOmitAll & |
| - ~(trim_http ? 0 : url_formatter::kFormatUrlOmitHTTP), |
| + url, url_formatter::kFormatUrlOmitAll & |
| + ~(trim_http ? 0 : url_formatter::kFormatUrlOmitHTTP), |
| net::UnescapeRule::SPACES, nullptr, nullptr, &offsets); |
| inline_autocomplete_offset = offsets.back(); |
| offsets.pop_back(); |