| Index: chrome/browser/ui/app_list/app_list_shower_views.h
|
| diff --git a/chrome/browser/ui/app_list/app_list_shower_views.h b/chrome/browser/ui/app_list/app_list_shower_views.h
|
| index 6feb12c8207a8ad4b83f54ad391b6dbfa4c049ac..f7b39a68bacb70282911a0e5fc3cc51fc2638dce 100644
|
| --- a/chrome/browser/ui/app_list/app_list_shower_views.h
|
| +++ b/chrome/browser/ui/app_list/app_list_shower_views.h
|
| @@ -12,10 +12,13 @@ namespace app_list {
|
| class AppListView;
|
| }
|
|
|
| +namespace browser_lifetime {
|
| +class ScopedKeepAlive;
|
| +}
|
| +
|
| class AppListShowerDelegate;
|
| class AppListShowerUnitTest;
|
| class Profile;
|
| -class ScopedKeepAlive;
|
|
|
| // Creates and shows an AppList as needed for non-Ash desktops. It is owned by
|
| // AppListServiceViews.
|
| @@ -64,7 +67,7 @@ class AppListShower {
|
| app_list::AppListView* app_list_;
|
|
|
| // Used to keep the browser process alive while the app list is visible.
|
| - scoped_ptr<ScopedKeepAlive> keep_alive_;
|
| + scoped_ptr<browser_lifetime::ScopedKeepAlive> keep_alive_;
|
|
|
| bool window_icon_updated_;
|
|
|
|
|