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

Side by Side Diff: chrome/browser/chromeos/login/supervised/supervised_user_creation_controller_new.cc

Issue 2841633003: Use TaskScheduler instead of blocking pool in supervised_user_creation_controller_new.cc. (Closed)
Patch Set: Created 3 years, 8 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/chromeos/login/supervised/supervised_user_creation_cont roller_new.h" 5 #include "chrome/browser/chromeos/login/supervised/supervised_user_creation_cont roller_new.h"
6 6
7 #include "base/base64.h" 7 #include "base/base64.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/files/file_path.h" 9 #include "base/files/file_path.h"
10 #include "base/files/file_util.h" 10 #include "base/files/file_util.h"
11 #include "base/metrics/user_metrics.h" 11 #include "base/metrics/user_metrics.h"
12 #include "base/strings/string_number_conversions.h" 12 #include "base/strings/string_number_conversions.h"
13 #include "base/strings/string_util.h" 13 #include "base/strings/string_util.h"
14 #include "base/sys_info.h" 14 #include "base/sys_info.h"
15 #include "base/task_runner_util.h" 15 #include "base/task_runner_util.h"
16 #include "base/threading/sequenced_worker_pool.h" 16 #include "base/task_scheduler/post_task.h"
17 #include "base/values.h" 17 #include "base/values.h"
18 #include "chrome/browser/chromeos/login/supervised/supervised_user_authenticatio n.h" 18 #include "chrome/browser/chromeos/login/supervised/supervised_user_authenticatio n.h"
19 #include "chrome/browser/chromeos/login/supervised/supervised_user_constants.h" 19 #include "chrome/browser/chromeos/login/supervised/supervised_user_constants.h"
20 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h" 20 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h"
21 #include "chrome/browser/chromeos/login/users/supervised_user_manager.h" 21 #include "chrome/browser/chromeos/login/users/supervised_user_manager.h"
22 #include "chrome/browser/chromeos/profiles/profile_helper.h" 22 #include "chrome/browser/chromeos/profiles/profile_helper.h"
23 #include "chrome/browser/lifetime/application_lifetime.h" 23 #include "chrome/browser/lifetime/application_lifetime.h"
24 #include "chrome/browser/sync/profile_sync_service_factory.h" 24 #include "chrome/browser/sync/profile_sync_service_factory.h"
25 #include "chromeos/cryptohome/cryptohome_parameters.h" 25 #include "chromeos/cryptohome/cryptohome_parameters.h"
26 #include "chromeos/dbus/dbus_thread_manager.h" 26 #include "chromeos/dbus/dbus_thread_manager.h"
27 #include "chromeos/dbus/session_manager_client.h" 27 #include "chromeos/dbus/session_manager_client.h"
28 #include "chromeos/login/auth/key.h" 28 #include "chromeos/login/auth/key.h"
29 #include "chromeos/login/auth/user_context.h" 29 #include "chromeos/login/auth/user_context.h"
30 #include "components/browser_sync/profile_sync_service.h" 30 #include "components/browser_sync/profile_sync_service.h"
31 #include "components/signin/core/account_id/account_id.h" 31 #include "components/signin/core/account_id/account_id.h"
32 #include "components/user_manager/user.h" 32 #include "components/user_manager/user.h"
33 #include "components/user_manager/user_manager.h" 33 #include "components/user_manager/user_manager.h"
34 #include "content/public/browser/browser_thread.h"
35 #include "crypto/random.h" 34 #include "crypto/random.h"
36 #include "google_apis/gaia/google_service_auth_error.h" 35 #include "google_apis/gaia/google_service_auth_error.h"
37 36
38 namespace chromeos { 37 namespace chromeos {
39 38
40 namespace { 39 namespace {
41 40
42 const int kUserCreationTimeoutSeconds = 30; // 30 seconds. 41 const int kUserCreationTimeoutSeconds = 30; // 30 seconds.
43 42
44 bool StoreSupervisedUserFiles(const std::string& token, 43 bool StoreSupervisedUserFiles(const std::string& token,
(...skipping 296 matching lines...) Expand 10 before | Expand all | Expand 10 after
341 const std::string& token) { 340 const std::string& token) {
342 DCHECK(creation_context_); 341 DCHECK(creation_context_);
343 DCHECK_EQ(CRYPTOHOME_CREATED, stage_); 342 DCHECK_EQ(CRYPTOHOME_CREATED, stage_);
344 343
345 stage_ = DASHBOARD_CREATED; 344 stage_ = DASHBOARD_CREATED;
346 345
347 if (error.state() == GoogleServiceAuthError::NONE) { 346 if (error.state() == GoogleServiceAuthError::NONE) {
348 creation_context_->token = token; 347 creation_context_->token = token;
349 348
350 PostTaskAndReplyWithResult( 349 PostTaskAndReplyWithResult(
351 content::BrowserThread::GetBlockingPool() 350 base::CreateTaskRunnerWithTraits(
352 ->GetTaskRunnerWithShutdownBehavior( 351 base::TaskTraits()
353 base::SequencedWorkerPool::CONTINUE_ON_SHUTDOWN) 352 .MayBlock()
353 .WithPriority(base::TaskPriority::BACKGROUND)
354 .WithShutdownBehavior(
355 base::TaskShutdownBehavior::CONTINUE_ON_SHUTDOWN))
354 .get(), 356 .get(),
355 FROM_HERE, 357 FROM_HERE,
356 base::Bind(&StoreSupervisedUserFiles, creation_context_->token, 358 base::Bind(&StoreSupervisedUserFiles, creation_context_->token,
357 ProfileHelper::GetProfilePathByUserIdHash( 359 ProfileHelper::GetProfilePathByUserIdHash(
358 creation_context_->mount_hash)), 360 creation_context_->mount_hash)),
359 base::Bind( 361 base::Bind(
360 &SupervisedUserCreationControllerNew::OnSupervisedUserFilesStored, 362 &SupervisedUserCreationControllerNew::OnSupervisedUserFilesStored,
361 weak_factory_.GetWeakPtr())); 363 weak_factory_.GetWeakPtr()));
362 } else { 364 } else {
363 stage_ = STAGE_ERROR; 365 stage_ = STAGE_ERROR;
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
414 creation_context_->registration_utility.reset(); 416 creation_context_->registration_utility.reset();
415 chrome::AttemptUserExit(); 417 chrome::AttemptUserExit();
416 } 418 }
417 419
418 std::string SupervisedUserCreationControllerNew::GetSupervisedUserId() { 420 std::string SupervisedUserCreationControllerNew::GetSupervisedUserId() {
419 DCHECK(creation_context_); 421 DCHECK(creation_context_);
420 return creation_context_->local_user_id; 422 return creation_context_->local_user_id;
421 } 423 }
422 424
423 } // namespace chromeos 425 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698