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

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

Issue 247223003: Parsed search.json for importing search engine settings from FireFox. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed overlooked comments on Patch Set 14. Created 6 years, 5 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 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 #ifndef CHROME_UTILITY_IMPORTER_FIREFOX_IMPORTER_H_ 5 #ifndef CHROME_UTILITY_IMPORTER_FIREFOX_IMPORTER_H_
6 #define CHROME_UTILITY_IMPORTER_FIREFOX_IMPORTER_H_ 6 #define CHROME_UTILITY_IMPORTER_FIREFOX_IMPORTER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 29 matching lines...) Expand all
40 virtual ~FirefoxImporter(); 40 virtual ~FirefoxImporter();
41 41
42 void ImportBookmarks(); 42 void ImportBookmarks();
43 void ImportPasswords(); 43 void ImportPasswords();
44 void ImportHistory(); 44 void ImportHistory();
45 void ImportSearchEngines(); 45 void ImportSearchEngines();
46 // Import the user's home page, unless it is set to default home page as 46 // Import the user's home page, unless it is set to default home page as
47 // defined in browserconfig.properties. 47 // defined in browserconfig.properties.
48 void ImportHomepage(); 48 void ImportHomepage();
49 void GetSearchEnginesXMLData(std::vector<std::string>* search_engine_data); 49 void GetSearchEnginesXMLData(std::vector<std::string>* search_engine_data);
50 void GetSearchEnginesXMLDataFromJSON(
51 std::vector<std::string>* search_engine_data);
50 52
51 // The struct stores the information about a bookmark item. 53 // The struct stores the information about a bookmark item.
52 struct BookmarkItem; 54 struct BookmarkItem;
53 typedef std::vector<BookmarkItem*> BookmarkList; 55 typedef std::vector<BookmarkItem*> BookmarkList;
54 56
55 // Gets the specific IDs of bookmark root node from |db|. 57 // Gets the specific IDs of bookmark root node from |db|.
56 void LoadRootNodeID(sql::Connection* db, int* toolbar_folder_id, 58 void LoadRootNodeID(sql::Connection* db, int* toolbar_folder_id,
57 int* menu_folder_id, int* unsorted_folder_id); 59 int* menu_folder_id, int* unsorted_folder_id);
58 60
59 // Loads all livemark IDs from database |db|. 61 // Loads all livemark IDs from database |db|.
(...skipping 20 matching lines...) Expand all
80 82
81 #if defined(OS_POSIX) 83 #if defined(OS_POSIX)
82 // Stored because we can only access it from the UI thread. 84 // Stored because we can only access it from the UI thread.
83 std::string locale_; 85 std::string locale_;
84 #endif 86 #endif
85 87
86 DISALLOW_COPY_AND_ASSIGN(FirefoxImporter); 88 DISALLOW_COPY_AND_ASSIGN(FirefoxImporter);
87 }; 89 };
88 90
89 #endif // CHROME_UTILITY_IMPORTER_FIREFOX_IMPORTER_H_ 91 #endif // CHROME_UTILITY_IMPORTER_FIREFOX_IMPORTER_H_
OLDNEW
« no previous file with comments | « chrome/test/data/firefox_searchplugins/default/yahoo.xml ('k') | chrome/utility/importer/firefox_importer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698