chrome/browser/chromeos/login/supervised/supervised_user_creation_controller_new.cc - Issue 486843004: Change base/file_utils.h includes to base/files/file_utils.h in chrome/

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

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

Issue 486843004: Change base/file_utils.h includes to base/files/file_utils.h in chrome/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix bad merge Created 6 years, 4 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 | Annotate | Revision Log

« no previous file with comments | « chrome/browser/chromeos/login/startup_utils.cc ('k') | chrome/browser/chromeos/login/users/avatar/user_image_loader.cc » ('j') | no next file with comments »

OLD	NEW
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/file_util.h"

10 #include "base/files/file_path.h"	9 #include "base/files/file_path.h"

	10 #include "base/files/file_util.h"

11 #include "base/strings/string_number_conversions.h"	11 #include "base/strings/string_number_conversions.h"

12 #include "base/strings/string_util.h"	12 #include "base/strings/string_util.h"

13 #include "base/sys_info.h"	13 #include "base/sys_info.h"

14 #include "base/task_runner_util.h"	14 #include "base/task_runner_util.h"

15 #include "base/threading/sequenced_worker_pool.h"	15 #include "base/threading/sequenced_worker_pool.h"

16 #include "base/values.h"	16 #include "base/values.h"

17 #include "chrome/browser/chromeos/login/supervised/supervised_user_authenticatio n.h"	17 #include "chrome/browser/chromeos/login/supervised/supervised_user_authenticatio n.h"

18 #include "chrome/browser/chromeos/login/supervised/supervised_user_constants.h"	18 #include "chrome/browser/chromeos/login/supervised/supervised_user_constants.h"

19 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h"	19 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h"

20 #include "chrome/browser/chromeos/login/users/supervised_user_manager.h"	20 #include "chrome/browser/chromeos/login/users/supervised_user_manager.h"

(...skipping 382 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
403 creation_context_->registration_utility.reset();	403 creation_context_->registration_utility.reset();

404 chrome::AttemptUserExit();	404 chrome::AttemptUserExit();

405 }	405 }

406	406

407 std::string SupervisedUserCreationControllerNew::GetSupervisedUserId() {	407 std::string SupervisedUserCreationControllerNew::GetSupervisedUserId() {

408 DCHECK(creation_context_);	408 DCHECK(creation_context_);

409 return creation_context_->local_user_id;	409 return creation_context_->local_user_id;

410 }	410 }

411	411

412 } // namespace chromeos	412 } // namespace chromeos

OLD	NEW