chrome/browser/mac/master_prefs.mm - 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/mac/master_prefs.mm

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/local_discovery/pwg_raster_converter.cc ('k') | chrome/browser/mac/relauncher.cc » ('j') | no next file with comments »

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

6	6

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

8 #include "base/mac/foundation_util.h"	8 #include "base/mac/foundation_util.h"

9 #include "chrome/common/chrome_paths_internal.h"	9 #include "chrome/common/chrome_paths_internal.h"

10 #include "chrome/common/chrome_version_info.h"	10 #include "chrome/common/chrome_version_info.h"

11	11

12 namespace {	12 namespace {

13	13

14 #if defined(GOOGLE_CHROME_BUILD)	14 #if defined(GOOGLE_CHROME_BUILD)

15 // This should be NSApplicationSupportDirectory, but it has already been	15 // This should be NSApplicationSupportDirectory, but it has already been

16 // released using NSLibraryDirectory.	16 // released using NSLibraryDirectory.

17 const NSSearchPathDirectory kSearchPath = NSLibraryDirectory;	17 const NSSearchPathDirectory kSearchPath = NSLibraryDirectory;

(...skipping 36 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
54 // /Library/Application Support/Chromium/Chromium Master Preferences	54 // /Library/Application Support/Chromium/Chromium Master Preferences

55 base::FilePath search_path;	55 base::FilePath search_path;

56 if (!base::mac::GetLocalDirectory(kSearchPath, &search_path))	56 if (!base::mac::GetLocalDirectory(kSearchPath, &search_path))

57 return base::FilePath();	57 return base::FilePath();

58	58

59 return search_path.Append(kMasterPreferencesDirectory)	59 return search_path.Append(kMasterPreferencesDirectory)

60 .Append(kMasterPreferencesFileName);	60 .Append(kMasterPreferencesFileName);

61 }	61 }

62	62

63 } // namespace master_prefs	63 } // namespace master_prefs

OLD	NEW