| Index: athena/extensions/shell/shell_search_controller_factory.cc
|
| diff --git a/athena/extensions/shell/shell_search_controller_factory.cc b/athena/extensions/shell/shell_search_controller_factory.cc
|
| index d8df1ec6fa3c8aefa15a813924d2c3e3dee226ab..5b9422d545ffa8ce560fb31c94ee5390995f611b 100644
|
| --- a/athena/extensions/shell/shell_search_controller_factory.cc
|
| +++ b/athena/extensions/shell/shell_search_controller_factory.cc
|
| @@ -22,7 +22,7 @@ scoped_ptr<app_list::SearchController> ShellSearchControllerFactory::Create(
|
| app_list::AppListModel::SearchResults* results) {
|
| scoped_ptr<app_list::SearchController> controller(
|
| new app_list::SearchController(
|
| - search_box, results, NULL /* no history */));
|
| + search_box, results, nullptr /* no history */));
|
| controller->AddProvider(app_list::Mixer::MAIN_GROUP,
|
| scoped_ptr<app_list::SearchProvider>(
|
| new UrlSearchProvider(browser_context_)));
|
|
|