| Index: components/omnibox/browser/omnibox_controller.cc
|
| diff --git a/components/omnibox/browser/omnibox_controller.cc b/components/omnibox/browser/omnibox_controller.cc
|
| index 9cbe634dfc8eb0eabfeb49ddcdda3118a69f90ec..9b5b84ae48372d696b2cedca1345e34dde4ccfd6 100644
|
| --- a/components/omnibox/browser/omnibox_controller.cc
|
| +++ b/components/omnibox/browser/omnibox_controller.cc
|
| @@ -19,7 +19,7 @@ OmniboxController::OmniboxController(OmniboxEditModel* omnibox_edit_model,
|
| OmniboxClient* client)
|
| : omnibox_edit_model_(omnibox_edit_model),
|
| client_(client),
|
| - popup_(NULL),
|
| + popup_(nullptr),
|
| autocomplete_controller_(new AutocompleteController(
|
| client_->CreateAutocompleteProviderClient(),
|
| this,
|
| @@ -51,7 +51,7 @@ void OmniboxController::OnResultChanged(bool default_match_changed) {
|
| } else {
|
| InvalidateCurrentMatch();
|
| popup_->OnResultChanged();
|
| - omnibox_edit_model_->OnPopupDataChanged(base::string16(), NULL,
|
| + omnibox_edit_model_->OnPopupDataChanged(base::string16(), nullptr,
|
| base::string16(), false);
|
| }
|
| } else {
|
|
|