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

Side by Side 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 PS7 comments, replace strings by a struct ptr, chromeappdelegate ctor takes a boolean 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/app_list/profile_loader.h" 5 #include "chrome/browser/ui/app_list/profile_loader.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/files/file_path.h" 8 #include "base/files/file_path.h"
9 #include "chrome/browser/apps/scoped_keep_alive.h" 9 #include "chrome/browser/lifetime/keep_alive_options.h"
10 #include "chrome/browser/lifetime/scoped_keep_alive.h"
10 #include "chrome/browser/ui/app_list/profile_store.h" 11 #include "chrome/browser/ui/app_list/profile_store.h"
11 #include "chrome/browser/ui/user_manager.h" 12 #include "chrome/browser/ui/user_manager.h"
12 13
14 namespace {
15
16 static const KeepAliveOptions g_keep_alive_options = {"ProfileLoader"};
17
18 } // namespace
19
13 ProfileLoader::ProfileLoader(ProfileStore* profile_store) 20 ProfileLoader::ProfileLoader(ProfileStore* profile_store)
14 : profile_store_(profile_store), 21 : profile_store_(profile_store),
15 profile_load_sequence_id_(0), 22 profile_load_sequence_id_(0),
16 pending_profile_loads_(0), 23 pending_profile_loads_(0),
17 weak_factory_(this) { 24 weak_factory_(this) {
18 } 25 }
19 26
20 ProfileLoader::~ProfileLoader() { 27 ProfileLoader::~ProfileLoader() {
21 } 28 }
22 29
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 base::Callback<void(Profile*)> callback, 66 base::Callback<void(Profile*)> callback,
60 Profile* profile) { 67 Profile* profile) {
61 DecrementPendingProfileLoads(); 68 DecrementPendingProfileLoads();
62 if (profile_load_sequence_id == profile_load_sequence_id_) 69 if (profile_load_sequence_id == profile_load_sequence_id_)
63 callback.Run(profile); 70 callback.Run(profile);
64 } 71 }
65 72
66 void ProfileLoader::IncrementPendingProfileLoads() { 73 void ProfileLoader::IncrementPendingProfileLoads() {
67 pending_profile_loads_++; 74 pending_profile_loads_++;
68 if (pending_profile_loads_ == 1) 75 if (pending_profile_loads_ == 1)
69 keep_alive_.reset(new ScopedKeepAlive); 76 keep_alive_.reset(new ScopedKeepAlive(&g_keep_alive_options));
70 } 77 }
71 78
72 void ProfileLoader::DecrementPendingProfileLoads() { 79 void ProfileLoader::DecrementPendingProfileLoads() {
73 pending_profile_loads_--; 80 pending_profile_loads_--;
74 if (pending_profile_loads_ == 0) 81 if (pending_profile_loads_ == 0)
75 keep_alive_.reset(); 82 keep_alive_.reset();
76 } 83 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698