Index: chrome/browser/ui/app_list/app_list_view_delegate.cc |
diff --git a/chrome/browser/ui/app_list/app_list_view_delegate.cc b/chrome/browser/ui/app_list/app_list_view_delegate.cc |
index 7424f830fe251c202e1452a082d5f6c30ce11c40..59634fee46f87b02b1f5fa46598530050a814c54 100644 |
--- a/chrome/browser/ui/app_list/app_list_view_delegate.cc |
+++ b/chrome/browser/ui/app_list/app_list_view_delegate.cc |
@@ -14,9 +14,9 @@ |
#include "base/prefs/pref_service.h" |
#include "base/profiler/scoped_tracker.h" |
#include "base/stl_util.h" |
-#include "chrome/browser/apps/scoped_keep_alive.h" |
#include "chrome/browser/browser_process.h" |
#include "chrome/browser/chrome_notification_types.h" |
+#include "chrome/browser/lifetime/browser_keep_alive.h" |
#include "chrome/browser/profiles/profile_info_cache.h" |
#include "chrome/browser/profiles/profile_manager.h" |
#include "chrome/browser/search/hotword_service.h" |
@@ -65,10 +65,6 @@ |
#include "ui/base/resource/resource_bundle.h" |
#include "ui/views/controls/webview/webview.h" |
-#if defined(TOOLKIT_VIEWS) |
-#include "ui/views/controls/webview/webview.h" |
-#endif |
- |
#if defined(USE_AURA) |
#include "ui/keyboard/keyboard_util.h" |
#endif |
@@ -347,7 +343,8 @@ void AppListViewDelegate::SetUpCustomLauncherPages() { |
apps::CustomLauncherPageContents* page_contents = |
new apps::CustomLauncherPageContents( |
scoped_ptr<extensions::AppDelegate>( |
- new ChromeAppDelegate(scoped_ptr<ScopedKeepAlive>())), |
+ new ChromeAppDelegate( |
+ scoped_ptr<browser_lifetime::ScopedKeepAlive>())), |
extension_id); |
page_contents->Initialize(profile_, *it); |
custom_page_contents_.push_back(page_contents); |