| Index: chrome/browser/ui/app_list/app_list_service_views.cc
|
| diff --git a/chrome/browser/ui/app_list/app_list_service_views.cc b/chrome/browser/ui/app_list/app_list_service_views.cc
|
| index 8ae98e5e8010d4f451a95b732ffdad555759f65e..4cebc905bdca6153140693d95ab6f021fab0df86 100644
|
| --- a/chrome/browser/ui/app_list/app_list_service_views.cc
|
| +++ b/chrome/browser/ui/app_list/app_list_service_views.cc
|
| @@ -6,13 +6,16 @@
|
|
|
| #include <utility>
|
|
|
| -#include "chrome/browser/apps/scoped_keep_alive.h"
|
| +#include "chrome/browser/lifetime/keep_alive_options.h"
|
| +#include "chrome/browser/lifetime/scoped_keep_alive.h"
|
| #include "chrome/browser/ui/app_list/app_list_controller_delegate.h"
|
| #include "ui/app_list/app_list_switches.h"
|
| #include "ui/app_list/views/app_list_main_view.h"
|
| #include "ui/app_list/views/app_list_view.h"
|
| #include "ui/app_list/views/contents_view.h"
|
|
|
| +const KeepAliveOptions kKeepAliveOptions = {"AppListServiceViews"};
|
| +
|
| AppListServiceViews::AppListServiceViews(
|
| scoped_ptr<AppListControllerDelegate> controller_delegate)
|
| : shower_(this),
|
| @@ -116,7 +119,7 @@ void AppListServiceViews::ShowForProfileInternal(
|
| app_list::AppListModel::State state) {
|
| DCHECK(profile);
|
|
|
| - ScopedKeepAlive keep_alive;
|
| + ScopedKeepAlive keep_alive(&kKeepAliveOptions);
|
|
|
| CreateForProfile(profile);
|
|
|
|
|