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

Side by Side Diff: chrome/common/importer/safari_importer_utils.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/common/importer/firefox_importer_utils_win.cc ('k') | chrome/common/logging_chrome.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/safari_importer_utils.h" 5 #include "chrome/common/importer/safari_importer_utils.h"
6 6
7 #include "base/file_util.h"
8 #include "base/files/file_path.h" 7 #include "base/files/file_path.h"
8 #include "base/files/file_util.h"
9 #include "chrome/common/importer/importer_data_types.h" 9 #include "chrome/common/importer/importer_data_types.h"
10 10
11 bool SafariImporterCanImport(const base::FilePath& library_dir, 11 bool SafariImporterCanImport(const base::FilePath& library_dir,
12 uint16* services_supported) { 12 uint16* services_supported) {
13 DCHECK(services_supported); 13 DCHECK(services_supported);
14 *services_supported = importer::NONE; 14 *services_supported = importer::NONE;
15 15
16 // Import features are toggled by the following: 16 // Import features are toggled by the following:
17 // bookmarks import: existence of ~/Library/Safari/Bookmarks.plist file. 17 // bookmarks import: existence of ~/Library/Safari/Bookmarks.plist file.
18 // history import: existence of ~/Library/Safari/History.plist file. 18 // history import: existence of ~/Library/Safari/History.plist file.
19 base::FilePath safari_dir = library_dir.Append("Safari"); 19 base::FilePath safari_dir = library_dir.Append("Safari");
20 base::FilePath bookmarks_path = safari_dir.Append("Bookmarks.plist"); 20 base::FilePath bookmarks_path = safari_dir.Append("Bookmarks.plist");
21 base::FilePath history_path = safari_dir.Append("History.plist"); 21 base::FilePath history_path = safari_dir.Append("History.plist");
22 22
23 if (base::PathExists(bookmarks_path)) 23 if (base::PathExists(bookmarks_path))
24 *services_supported |= importer::FAVORITES; 24 *services_supported |= importer::FAVORITES;
25 if (base::PathExists(history_path)) 25 if (base::PathExists(history_path))
26 *services_supported |= importer::HISTORY; 26 *services_supported |= importer::HISTORY;
27 27
28 return *services_supported != importer::NONE; 28 return *services_supported != importer::NONE;
29 } 29 }
OLDNEW
« no previous file with comments | « chrome/common/importer/firefox_importer_utils_win.cc ('k') | chrome/common/logging_chrome.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698