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

Side by Side Diff: chrome/browser/ui/app_list/profile_loader.cc

Issue 856733004: Loading the Launcher with a Locked Profile launched UserManager. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: tapted@: test fixes and remove a const-ref. Created 5 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/apps/scoped_keep_alive.h"
10 #include "chrome/browser/ui/app_list/profile_store.h" 10 #include "chrome/browser/ui/app_list/profile_store.h"
11 #include "chrome/browser/ui/user_manager.h"
11 12
12 ProfileLoader::ProfileLoader(ProfileStore* profile_store) 13 ProfileLoader::ProfileLoader(ProfileStore* profile_store)
13 : profile_store_(profile_store), 14 : profile_store_(profile_store),
14 profile_load_sequence_id_(0), 15 profile_load_sequence_id_(0),
15 pending_profile_loads_(0), 16 pending_profile_loads_(0),
16 weak_factory_(this) { 17 weak_factory_(this) {
17 } 18 }
18 19
19 ProfileLoader::~ProfileLoader() { 20 ProfileLoader::~ProfileLoader() {
20 } 21 }
21 22
22 bool ProfileLoader::IsAnyProfileLoading() const { 23 bool ProfileLoader::IsAnyProfileLoading() const {
23 return pending_profile_loads_ > 0; 24 return pending_profile_loads_ > 0;
24 } 25 }
25 26
26 void ProfileLoader::InvalidatePendingProfileLoads() { 27 void ProfileLoader::InvalidatePendingProfileLoads() {
27 ++profile_load_sequence_id_; 28 ++profile_load_sequence_id_;
28 } 29 }
29 30
30 void ProfileLoader::LoadProfileInvalidatingOtherLoads( 31 void ProfileLoader::LoadProfileInvalidatingOtherLoads(
31 const base::FilePath& profile_file_path, 32 const base::FilePath& profile_file_path,
32 base::Callback<void(Profile*)> callback) { 33 base::Callback<void(Profile*)> callback) {
33 InvalidatePendingProfileLoads(); 34 InvalidatePendingProfileLoads();
34 35
36 if (profile_store_->IsProfileLocked(profile_file_path)) {
37 UserManager::Show(base::FilePath(),
38 profiles::USER_MANAGER_NO_TUTORIAL,
39 profiles::USER_MANAGER_SELECT_PROFILE_APP_LAUNCHER);
40 return;
41 }
42
35 Profile* profile = profile_store_->GetProfileByPath(profile_file_path); 43 Profile* profile = profile_store_->GetProfileByPath(profile_file_path);
36 if (profile) { 44 if (profile) {
37 callback.Run(profile); 45 callback.Run(profile);
38 return; 46 return;
39 } 47 }
40 48
41 IncrementPendingProfileLoads(); 49 IncrementPendingProfileLoads();
42 profile_store_->LoadProfileAsync( 50 profile_store_->LoadProfileAsync(
43 profile_file_path, 51 profile_file_path,
44 base::Bind(&ProfileLoader::OnProfileLoaded, 52 base::Bind(&ProfileLoader::OnProfileLoaded,
(...skipping 14 matching lines...) Expand all
59 pending_profile_loads_++; 67 pending_profile_loads_++;
60 if (pending_profile_loads_ == 1) 68 if (pending_profile_loads_ == 1)
61 keep_alive_.reset(new ScopedKeepAlive); 69 keep_alive_.reset(new ScopedKeepAlive);
62 } 70 }
63 71
64 void ProfileLoader::DecrementPendingProfileLoads() { 72 void ProfileLoader::DecrementPendingProfileLoads() {
65 pending_profile_loads_--; 73 pending_profile_loads_--;
66 if (pending_profile_loads_ == 0) 74 if (pending_profile_loads_ == 0)
67 keep_alive_.reset(); 75 keep_alive_.reset();
68 } 76 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/app_list/app_list_service_mac.mm ('k') | chrome/browser/ui/app_list/profile_store.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698