chrome/common/importer/importer_data_types.h - Issue 616763002: Importing certain bookmarks from firefox and HTML file as search engines.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/common/importer/importer_data_types.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 more 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

« chrome/browser/importer/in_process_importer_bridge.cc ('K') | « chrome/common/importer/importer_bridge.h ('k') | chrome/common/importer/profile_import_process_messages.h » ('j') | chrome/utility/importer/bookmark_html_reader.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/common/importer/importer_data_types.h

diff --git a/chrome/common/importer/importer_data_types.h b/chrome/common/importer/importer_data_types.h

index d9594e76d08b4c5cb643ce808a8dde78a3cfb910..453621a8731fd99150d391ca94ae8fc65c650011 100644

--- a/chrome/common/importer/importer_data_types.h

+++ b/chrome/common/importer/importer_data_types.h

@@ -47,9 +47,13 @@ struct SourceProfile {

std::string locale;

};

-// Contains information needed for importing bookmarks/search engine urls, etc.

-struct URLKeywordInfo {

- GURL url;

+// Contains information needed for importing search engine urls.

+struct SearchEngineInfo {

+ // GURL derived from an url will be invalid if the url contains replacement

+ // terms(s) in host (e.g., http://example.%s.com). Since |url| may contain

+ // replacement term(s) in the host, |url| is a string instead of a GURL since

+ // it may not actually be a valid GURL directly (e.g. for "http://%s.com").

+ base::string16 url;

base::string16 keyword;

base::string16 display_name;

};