chrome/browser/ui/app_list/profile_loader.cc - Issue 1708343002: Add ScopedKeepAlive to c/b/lifetime

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1708343002: Add ScopedKeepAlive to c/b/lifetime (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Address comments on PS15 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:

Index: chrome/browser/ui/app_list/profile_loader.cc

diff --git a/chrome/browser/ui/app_list/profile_loader.cc b/chrome/browser/ui/app_list/profile_loader.cc

index ec8d9a4e4103d1c7b1245cadd7d168a92cbd2ecf..7bc57f1f35c0a53e052848893e3368ac4970a93b 100644

--- a/chrome/browser/ui/app_list/profile_loader.cc

+++ b/chrome/browser/ui/app_list/profile_loader.cc

@@ -6,7 +6,8 @@

#include "base/bind.h"

#include "base/files/file_path.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/ui/app_list/profile_store.h"

#include "chrome/browser/ui/user_manager.h"

@@ -66,7 +67,7 @@ void ProfileLoader::OnProfileLoaded(int profile_load_sequence_id,

void ProfileLoader::IncrementPendingProfileLoads() {

pending_profile_loads_++;

if (pending_profile_loads_ == 1)

- keep_alive_.reset(new ScopedKeepAlive);

+ keep_alive_.reset(new ScopedKeepAlive(KeepAliveOrigin::PROFILE_LOADER));

}

void ProfileLoader::DecrementPendingProfileLoads() {