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

Side by Side Diff: chrome/common/importer/firefox_importer_utils_mac.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
OLDNEW
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 <Cocoa/Cocoa.h> 5 #include <Cocoa/Cocoa.h>
6 #include <sys/param.h> 6 #include <sys/param.h>
7 7
8 #include "chrome/common/importer/firefox_importer_utils.h" 8 #include "chrome/common/importer/firefox_importer_utils.h"
9 9
10 #include "base/file_util.h" 10 #include "base/files/file_util.h"
11 #include "base/mac/foundation_util.h" 11 #include "base/mac/foundation_util.h"
12 #include "base/path_service.h" 12 #include "base/path_service.h"
13 13
14 base::FilePath GetProfilesINI() { 14 base::FilePath GetProfilesINI() {
15 base::FilePath app_data_path; 15 base::FilePath app_data_path;
16 if (!PathService::Get(base::DIR_APP_DATA, &app_data_path)) { 16 if (!PathService::Get(base::DIR_APP_DATA, &app_data_path)) {
17 return base::FilePath(); 17 return base::FilePath();
18 } 18 }
19 base::FilePath ini_file = 19 base::FilePath ini_file =
20 app_data_path.Append("Firefox").Append("profiles.ini"); 20 app_data_path.Append("Firefox").Append("profiles.ini");
(...skipping 15 matching lines...) Expand all
36 NSBundle *ff_bundle = 36 NSBundle *ff_bundle =
37 [NSBundle bundleWithPath:[base::mac::CFToNSCast(appURL) path]]; 37 [NSBundle bundleWithPath:[base::mac::CFToNSCast(appURL) path]];
38 CFRelease(appURL); 38 CFRelease(appURL);
39 NSString *ff_library_path = 39 NSString *ff_library_path =
40 [[ff_bundle executablePath] stringByDeletingLastPathComponent]; 40 [[ff_bundle executablePath] stringByDeletingLastPathComponent];
41 char buf[MAXPATHLEN]; 41 char buf[MAXPATHLEN];
42 if (![ff_library_path getFileSystemRepresentation:buf maxLength:sizeof(buf)]) 42 if (![ff_library_path getFileSystemRepresentation:buf maxLength:sizeof(buf)])
43 return base::FilePath(); 43 return base::FilePath();
44 return base::FilePath(buf); 44 return base::FilePath(buf);
45 } 45 }
OLDNEW
« no previous file with comments | « chrome/common/importer/firefox_importer_utils_linux.cc ('k') | chrome/common/importer/firefox_importer_utils_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698