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

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

Issue 638863002: Replace FINAL and OVERRIDE with their C++11 counterparts in chrome/utility (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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
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 24 matching lines...) Expand all
35 // Importer for Safari on OS X. 35 // Importer for Safari on OS X.
36 class SafariImporter : public Importer { 36 class SafariImporter : public Importer {
37 public: 37 public:
38 // |library_dir| is the full path to the ~/Library directory, 38 // |library_dir| is the full path to the ~/Library directory,
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, 49 FRIEND_TEST_ALL_PREFIXES(SafariImporterTest,
50 BookmarkImportWithEmptyBookmarksMenu); 50 BookmarkImportWithEmptyBookmarksMenu);
51 FRIEND_TEST_ALL_PREFIXES(SafariImporterTest, FaviconImport); 51 FRIEND_TEST_ALL_PREFIXES(SafariImporterTest, FaviconImport);
52 FRIEND_TEST_ALL_PREFIXES(SafariImporterTest, HistoryImport); 52 FRIEND_TEST_ALL_PREFIXES(SafariImporterTest, HistoryImport);
53 53
54 virtual ~SafariImporter(); 54 virtual ~SafariImporter();
55 55
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 void LoadFaviconData(sql::Connection* db, 95 void LoadFaviconData(sql::Connection* db,
96 const FaviconMap& favicon_map, 96 const FaviconMap& favicon_map,
97 std::vector<ImportedFaviconUsage>* favicons); 97 std::vector<ImportedFaviconUsage>* favicons);
98 98
99 base::FilePath library_dir_; 99 base::FilePath library_dir_;
100 100
101 DISALLOW_COPY_AND_ASSIGN(SafariImporter); 101 DISALLOW_COPY_AND_ASSIGN(SafariImporter);
102 }; 102 };
103 103
104 #endif // CHROME_UTILITY_IMPORTER_SAFARI_IMPORTER_H_ 104 #endif // CHROME_UTILITY_IMPORTER_SAFARI_IMPORTER_H_
OLDNEW
« no previous file with comments | « chrome/utility/importer/ie_importer_win.h ('k') | chrome/utility/local_discovery/service_discovery_message_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698