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

Side by Side Diff: chrome/common/importer/firefox_importer_utils_win.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
OLDNEW
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/common/importer/firefox_importer_utils.h" 5 #include "chrome/common/importer/firefox_importer_utils.h"
6 6
7 #include <shlobj.h> 7 #include <shlobj.h>
8 8
9 #include "base/file_util.h" 9 #include "base/files/file_util.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
11 #include "base/strings/string16.h" 11 #include "base/strings/string16.h"
12 #include "base/win/registry.h" 12 #include "base/win/registry.h"
13 13
14 // NOTE: Keep these in order since we need test all those paths according 14 // NOTE: Keep these in order since we need test all those paths according
15 // to priority. For example. One machine has multiple users. One non-admin 15 // to priority. For example. One machine has multiple users. One non-admin
16 // user installs Firefox 2, which causes there is a Firefox2 entry under HKCU. 16 // user installs Firefox 2, which causes there is a Firefox2 entry under HKCU.
17 // One admin user installs Firefox 3, which causes there is a Firefox 3 entry 17 // One admin user installs Firefox 3, which causes there is a Firefox 3 entry
18 // under HKLM. So when the non-admin user log in, we should deal with Firefox 2 18 // under HKLM. So when the non-admin user log in, we should deal with Firefox 2
19 // related data instead of Firefox 3. 19 // related data instead of Firefox 3.
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 // under the "Application Data" folder in Windows XP, Vista, and 7. 73 // under the "Application Data" folder in Windows XP, Vista, and 7.
74 if (!PathService::Get(base::DIR_APP_DATA, &ini_file)) 74 if (!PathService::Get(base::DIR_APP_DATA, &ini_file))
75 return base::FilePath(); 75 return base::FilePath();
76 76
77 ini_file = ini_file.AppendASCII("Mozilla"); 77 ini_file = ini_file.AppendASCII("Mozilla");
78 ini_file = ini_file.AppendASCII("Firefox"); 78 ini_file = ini_file.AppendASCII("Firefox");
79 ini_file = ini_file.AppendASCII("profiles.ini"); 79 ini_file = ini_file.AppendASCII("profiles.ini");
80 80
81 return base::PathExists(ini_file) ? ini_file : base::FilePath(); 81 return base::PathExists(ini_file) ? ini_file : base::FilePath();
82 } 82 }
OLDNEW
« no previous file with comments | « chrome/common/importer/firefox_importer_utils_unittest.cc ('k') | chrome/common/importer/safari_importer_utils.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698