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

Side by Side Diff: chrome/utility/importer/safari_importer.h

Issue 119833002: [Import] [OSX] Don't create an empty folder when importing from Safari with an empty Bookmarks Menu. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove extraneous files, update READMEs Created 6 years, 11 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 #ifndef CHROME_UTILITY_IMPORTER_SAFARI_IMPORTER_H_ 5 #ifndef CHROME_UTILITY_IMPORTER_SAFARI_IMPORTER_H_
6 #define CHROME_UTILITY_IMPORTER_SAFARI_IMPORTER_H_ 6 #define CHROME_UTILITY_IMPORTER_SAFARI_IMPORTER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <vector> 10 #include <vector>
(...skipping 28 matching lines...) Expand all
39 // We pass it in as a parameter for testing purposes. 39 // We pass it in as a parameter for testing purposes.
40 explicit SafariImporter(const base::FilePath& library_dir); 40 explicit SafariImporter(const base::FilePath& library_dir);
41 41
42 // Importer: 42 // Importer:
43 virtual void StartImport(const importer::SourceProfile& source_profile, 43 virtual void StartImport(const importer::SourceProfile& source_profile,
44 uint16 items, 44 uint16 items,
45 ImporterBridge* bridge) OVERRIDE; 45 ImporterBridge* bridge) OVERRIDE;
46 46
47 private: 47 private:
48 FRIEND_TEST_ALL_PREFIXES(SafariImporterTest, BookmarkImport); 48 FRIEND_TEST_ALL_PREFIXES(SafariImporterTest, BookmarkImport);
49 FRIEND_TEST_ALL_PREFIXES(SafariImporterTest,
50 BookmarkImportWithEmptyBookmarksMenu);
49 FRIEND_TEST_ALL_PREFIXES(SafariImporterTest, FaviconImport); 51 FRIEND_TEST_ALL_PREFIXES(SafariImporterTest, FaviconImport);
50 FRIEND_TEST_ALL_PREFIXES(SafariImporterTest, HistoryImport); 52 FRIEND_TEST_ALL_PREFIXES(SafariImporterTest, HistoryImport);
51 53
52 virtual ~SafariImporter(); 54 virtual ~SafariImporter();
53 55
54 // Multiple URLs can share the same favicon; this is a map 56 // Multiple URLs can share the same favicon; this is a map
55 // of URLs -> IconIDs that we load as a temporary step before 57 // of URLs -> IconIDs that we load as a temporary step before
56 // actually loading the icons. 58 // actually loading the icons.
57 typedef std::map<int64, std::set<GURL> > FaviconMap; 59 typedef std::map<int64, std::set<GURL> > FaviconMap;
58 60
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 void LoadFaviconData(sql::Connection* db, 95 void LoadFaviconData(sql::Connection* db,
94 const FaviconMap& favicon_map, 96 const FaviconMap& favicon_map,
95 std::vector<ImportedFaviconUsage>* favicons); 97 std::vector<ImportedFaviconUsage>* favicons);
96 98
97 base::FilePath library_dir_; 99 base::FilePath library_dir_;
98 100
99 DISALLOW_COPY_AND_ASSIGN(SafariImporter); 101 DISALLOW_COPY_AND_ASSIGN(SafariImporter);
100 }; 102 };
101 103
102 #endif // CHROME_UTILITY_IMPORTER_SAFARI_IMPORTER_H_ 104 #endif // CHROME_UTILITY_IMPORTER_SAFARI_IMPORTER_H_
OLDNEW
« no previous file with comments | « chrome/test/data/safari_import/Safari/WebpageIcons.db ('k') | chrome/utility/importer/safari_importer.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698