Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(9689)

Unified Diff: chrome/browser/ui/app_list/app_list_view_delegate.cc

Issue 1708343002: Add ScopedKeepAlive to c/b/lifetime (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove KeepAliveOrigin::TEST Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 f5338e737f069b0518b450ef7a2e18581ca992cc..65c4b69350ae159ce726ea2ee874f9a291a17691 100644
--- a/chrome/browser/ui/app_list/app_list_view_delegate.cc
+++ b/chrome/browser/ui/app_list/app_list_view_delegate.cc
@@ -16,9 +16,9 @@
#include "base/profiler/scoped_tracker.h"
#include "base/stl_util.h"
#include "build/build_config.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/scoped_keep_alive.h"
#include "chrome/browser/profiles/profile_attributes_entry.h"
#include "chrome/browser/profiles/profile_attributes_storage.h"
#include "chrome/browser/profiles/profile_manager.h"
@@ -350,8 +350,7 @@ void AppListViewDelegate::SetUpCustomLauncherPages() {
std::string extension_id = it->host();
apps::CustomLauncherPageContents* page_contents =
new apps::CustomLauncherPageContents(
- scoped_ptr<extensions::AppDelegate>(
- new ChromeAppDelegate(scoped_ptr<ScopedKeepAlive>())),
+ scoped_ptr<extensions::AppDelegate>(new ChromeAppDelegate(false)),
extension_id);
page_contents->Initialize(profile_, *it);
custom_page_contents_.push_back(page_contents);
« no previous file with comments | « chrome/browser/ui/app_list/app_list_shower_views_unittest.cc ('k') | chrome/browser/ui/app_list/profile_loader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698