chrome/browser/chromeos/drive/file_system.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/drive/file_system.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, 3 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/drive/file_cache_unittest.cc ('k') | chrome/browser/chromeos/drive/file_system/copy_operation_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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/drive/file_system.h"	5 #include "chrome/browser/chromeos/drive/file_system.h"

6	6

7 #include "base/bind.h"	7 #include "base/bind.h"

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

9 #include "base/prefs/pref_service.h"	9 #include "base/prefs/pref_service.h"

10 #include "chrome/browser/chromeos/drive/change_list_loader.h"	10 #include "chrome/browser/chromeos/drive/change_list_loader.h"

11 #include "chrome/browser/chromeos/drive/directory_loader.h"	11 #include "chrome/browser/chromeos/drive/directory_loader.h"

12 #include "chrome/browser/chromeos/drive/drive.pb.h"	12 #include "chrome/browser/chromeos/drive/drive.pb.h"

13 #include "chrome/browser/chromeos/drive/file_cache.h"	13 #include "chrome/browser/chromeos/drive/file_cache.h"

14 #include "chrome/browser/chromeos/drive/file_change.h"	14 #include "chrome/browser/chromeos/drive/file_change.h"

15 #include "chrome/browser/chromeos/drive/file_system/copy_operation.h"	15 #include "chrome/browser/chromeos/drive/file_system/copy_operation.h"

16 #include "chrome/browser/chromeos/drive/file_system/create_directory_operation.h "	16 #include "chrome/browser/chromeos/drive/file_system/create_directory_operation.h "

17 #include "chrome/browser/chromeos/drive/file_system/create_file_operation.h"	17 #include "chrome/browser/chromeos/drive/file_system/create_file_operation.h"

18 #include "chrome/browser/chromeos/drive/file_system/download_operation.h"	18 #include "chrome/browser/chromeos/drive/file_system/download_operation.h"

(...skipping 968 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
987 FROM_HERE,	987 FROM_HERE,

988 base::Bind(&GetPathFromResourceIdOnBlockingPool,	988 base::Bind(&GetPathFromResourceIdOnBlockingPool,

989 resource_metadata_,	989 resource_metadata_,

990 resource_id,	990 resource_id,

991 file_path),	991 file_path),

992 base::Bind(&GetPathFromResourceIdAfterGetPath,	992 base::Bind(&GetPathFromResourceIdAfterGetPath,

993 base::Owned(file_path),	993 base::Owned(file_path),

994 callback));	994 callback));

995 }	995 }

996 } // namespace drive	996 } // namespace drive

OLD	NEW