Chromium Code Reviews| Index: chrome/browser/ui/app_list/app_list_shower_views.cc |
| diff --git a/chrome/browser/ui/app_list/app_list_shower_views.cc b/chrome/browser/ui/app_list/app_list_shower_views.cc |
| index 72139cafdd1e301d8313ad0965c9303bf1e22911..4bec5fd12d73c7db6c3ba5f148203f1ff20c525c 100644 |
| --- a/chrome/browser/ui/app_list/app_list_shower_views.cc |
| +++ b/chrome/browser/ui/app_list/app_list_shower_views.cc |
| @@ -9,7 +9,8 @@ |
| #include "base/profiler/scoped_tracker.h" |
| #include "base/single_thread_task_runner.h" |
| #include "base/thread_task_runner_handle.h" |
| -#include "chrome/browser/apps/scoped_keep_alive.h" |
| +#include "chrome/browser/lifetime/keep_alive_types.h" |
| +#include "chrome/browser/lifetime/scoped_keep_alive.h" |
| #include "chrome/browser/profiles/profile.h" |
| #include "chrome/browser/ui/app_list/app_list_shower_delegate.h" |
| #include "chrome/browser/ui/app_list/app_list_view_delegate.h" |
| @@ -29,7 +30,7 @@ AppListShower::~AppListShower() { |
| void AppListShower::ShowForCurrentProfile() { |
| DCHECK(HasView()); |
| - keep_alive_.reset(new ScopedKeepAlive); |
| + keep_alive_.reset(new ScopedKeepAlive(KeepAliveOrigin::APP_LIST_SHOWER)); |
|
sky
2016/02/25 18:43:50
Ugh! What a name (I get that you're matching the c
dgn
2016/02/25 20:08:50
Haha, I also had a double take while writing that.
|
| // If the app list is already displaying |profile| just activate it (in case |
| // we have lost focus). |