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

Unified Diff: chrome/utility/importer/bookmark_html_reader.h

Issue 616763002: Importing certain bookmarks from firefox and HTML file as search engines. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed feedback. Created 6 years, 1 month 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 side-by-side diff with in-line comments
Download patch
Index: chrome/utility/importer/bookmark_html_reader.h
diff --git a/chrome/utility/importer/bookmark_html_reader.h b/chrome/utility/importer/bookmark_html_reader.h
index 274c9a272169ee622e9b8f1c64d395e3764ab045..5013ac8dc7959f433095e21d4761bc17601e2a82 100644
--- a/chrome/utility/importer/bookmark_html_reader.h
+++ b/chrome/utility/importer/bookmark_html_reader.h
@@ -10,6 +10,7 @@
#include "base/callback_forward.h"
#include "base/strings/string16.h"
+#include "chrome/common/importer/importer_data_types.h"
class GURL;
struct ImportedBookmarkEntry;
@@ -37,6 +38,9 @@ namespace bookmark_html_reader {
// |bookmarks| is a pointer to a vector, which is filled with the imported
// bookmarks. It may not be NULL.
//
+// |search_engines| is a pointer to a vector, which is filled with the imported
+// search engines.
+//
// |favicons| is a pointer to a vector, which is filled with the favicons of
// imported bookmarks. It may be NULL, in which case favicons are not imported.
void ImportBookmarksFile(
@@ -44,8 +48,18 @@ void ImportBookmarksFile(
const base::Callback<bool(const GURL&)>& valid_url_callback,
const base::FilePath& file_path,
std::vector<ImportedBookmarkEntry>* bookmarks,
+ std::vector<importer::SearchEngineInfo>* search_engines,
std::vector<ImportedFaviconUsage>* favicons);
+// Checks if a bookmark |url| can be imported as a search engine. A bookmark
Peter Kasting 2014/11/11 22:42:12 Nit: How about: Returns true if |url| should be i
Tapu Ghose 2014/11/15 05:22:20 Agreed. Looks simpler.
+// |url| may not be imported as a bookmark if |url| contains replacement term(s)
+// in host. However, such |url| may be eligible to be imported as a search
Ilya Sherman 2014/11/10 23:00:22 nit: "in host" -> "in its host"
Tapu Ghose 2014/11/15 05:22:20 Acknowledged.
+// engine.
+bool CanImportURLAsSearchEngine(const GURL& url,
+ const base::string16& keyword,
+ const base::string16& title,
+ importer::SearchEngineInfo* search_engine);
+
namespace internal {
// The file format that BookmarkHTMLReader parses starts with a heading

Powered by Google App Engine
This is Rietveld 408576698