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..fe630003bfca9e98cd18a6123496ec369c96a48d 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_options.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" |
@@ -17,6 +18,12 @@ |
#include "ui/gfx/geometry/point.h" |
#include "ui/gfx/screen.h" |
+namespace { |
+ |
+static const KeepAliveOptions g_keep_alive_options = {"AppListShowerViews"}; |
+ |
+} // namespace |
+ |
AppListShower::AppListShower(AppListShowerDelegate* delegate) |
: delegate_(delegate), |
profile_(NULL), |
@@ -29,7 +36,7 @@ AppListShower::~AppListShower() { |
void AppListShower::ShowForCurrentProfile() { |
DCHECK(HasView()); |
- keep_alive_.reset(new ScopedKeepAlive); |
+ keep_alive_.reset(new ScopedKeepAlive(&g_keep_alive_options)); |
// If the app list is already displaying |profile| just activate it (in case |
// we have lost focus). |