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

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

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 dependency issue. Created 5 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 side-by-side diff with in-line comments
Download patch
Index: chrome/utility/importer/bookmark_html_reader.cc
diff --git a/chrome/utility/importer/bookmark_html_reader.cc b/chrome/utility/importer/bookmark_html_reader.cc
index e11dc1d7761f68631aede24d93a78fe37839f162..8ee67f1bf20e3078f06a4ee774955ffe374cb416 100644
--- a/chrome/utility/importer/bookmark_html_reader.cc
+++ b/chrome/utility/importer/bookmark_html_reader.cc
@@ -10,10 +10,13 @@
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_split.h"
#include "base/strings/string_util.h"
+#include "base/strings/utf_string_conversions.h"
#include "base/time/time.h"
#include "chrome/common/importer/imported_bookmark_entry.h"
#include "chrome/common/importer/imported_favicon_usage.h"
#include "chrome/utility/importer/favicon_reencode.h"
+#include "components/search_engines/search_terms_data.h"
+#include "components/search_engines/template_url.h"
#include "net/base/data_url.h"
#include "net/base/escape.h"
#include "url/gurl.h"
@@ -91,6 +94,7 @@ 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) {
std::string content;
base::ReadFileToString(file_path, &content);
@@ -150,6 +154,20 @@ void ImportBookmarksFile(
&add_date, &post_data) ||
internal::ParseMinimumBookmarkFromLine(line, charset, &title, &url);
+ // If bookmark contains a valid replaceable url and a keyword then import
+ // it as search engine.
+ std::string search_engine_url;
+ if (is_bookmark && post_data.empty() &&
+ CanImportURLAsSearchEngine(url, &search_engine_url) &&
+ !shortcut.empty()) {
+ importer::SearchEngineInfo search_engine_info;
+ search_engine_info.url.assign(base::UTF8ToUTF16(search_engine_url));
+ search_engine_info.keyword = shortcut;
+ search_engine_info.display_name = title;
+ search_engines->push_back(search_engine_info);
+ continue;
+ }
+
if (is_bookmark)
last_folder_is_empty = false;
@@ -238,6 +256,26 @@ void ImportBookmarksFile(
}
}
+bool CanImportURLAsSearchEngine(const GURL& url,
+ std::string* search_engine_url) {
+ std::string url_spec = url.possibly_invalid_spec();
+
+ if (url_spec.empty())
+ return false;
+
+ url_spec = net::UnescapeURLComponent(url_spec,
+ net::UnescapeRule::URL_SPECIAL_CHARS);
+
+ // Replace replacement terms ("%s") in |url_spec| with {searchTerms}.
+ url_spec =
+ TemplateURLRef::DisplayURLToURLRef(base::UTF8ToUTF16(url_spec));
+
+ TemplateURLData data;
+ data.SetURL(url_spec);
+ *search_engine_url = url_spec;
+ return TemplateURL(data).SupportsReplacement(SearchTermsData());
+}
+
namespace internal {
bool ParseCharsetFromLine(const std::string& line, std::string* charset) {
« no previous file with comments | « chrome/utility/importer/bookmark_html_reader.h ('k') | chrome/utility/importer/bookmark_html_reader_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698