chrome/browser/importer/importer_list.cc - Issue 22332003: Add option to import from bookmarks html file to "Import Bookmarks..." dialog.

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/browser/importer/importer_list.cc

Issue 22332003: Add option to import from bookmarks html file to "Import Bookmarks..." dialog. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rm debug code Created 7 years, 4 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

« chrome/app/generated_resources.grd ('K') | « chrome/app/generated_resources.grd ('k') | chrome/browser/resources/options/import_data_overlay.html » ('j') | chrome/browser/resources/options/import_data_overlay.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/importer/importer_list.cc

diff --git a/chrome/browser/importer/importer_list.cc b/chrome/browser/importer/importer_list.cc

index 1863d4a46c9f34bd258cc55c423435099774a3d6..46382c557bcf9834f70cb5d0ce812efe0fd3d3d6 100644

--- a/chrome/browser/importer/importer_list.cc

+++ b/chrome/browser/importer/importer_list.cc

@@ -175,6 +175,14 @@ void ImporterList::DetectSourceProfilesWorker(const std::string& locale) {

#else

DetectFirefoxProfiles(locale, &profiles);

#endif

+ importer::SourceProfile* bookmarks_file = new importer::SourceProfile;

+ bookmarks_file->importer_name =

+ l10n_util::GetStringUTF16(IDS_IMPORT_FROM_BOOKMARKS_HTML_FILE);

+ bookmarks_file->importer_type = importer::TYPE_BOOKMARKS_FILE;

+ bookmarks_file->source_path.clear();

+ bookmarks_file->app_path.clear();

Ilya Sherman 2013/08/08 08:09:28 nit: These shouldn't be needed, as they ought to h

tfarina 2013/08/10 15:05:39 Done.

+ bookmarks_file->services_supported = importer::FAVORITES;

+ profiles.push_back(bookmarks_file);

// TODO(jhawkins): Remove this condition once DetectSourceProfilesHack is

// removed.