summaryrefslogtreecommitdiffstats
path: root/chrome/browser/importer
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-10 15:05:41 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-10 15:05:41 +0000
commit2a7a8ec4855d04db2fb5e44802db5c50995655ce (patch)
tree7f49830d1780e4cf69773e03b6b4a237f170a919 /chrome/browser/importer
parent549480388f512ecd0e5af9356e4abfce655072a3 (diff)
downloadchromium_src-2a7a8ec4855d04db2fb5e44802db5c50995655ce.zip
chromium_src-2a7a8ec4855d04db2fb5e44802db5c50995655ce.tar.gz
chromium_src-2a7a8ec4855d04db2fb5e44802db5c50995655ce.tar.bz2
Add option to import from bookmarks html file to "Import Bookmarks..." dialog.
To test this new feature one can do the following: On chrome, open the "Import Bookmarks and Settings..." dialog, you can do this by three ways, one is to navigate to chrome://settings/importData, another is to open chrome://settings (either through wrench menu or navigating to it through omnibox) and then under the Users category click on "Import Bookmarks..." button to open the dialog. The third way to open this dialog is Wrench->Bookmarks->Import Bookmarks and Settings...". Once the dialog is opened, open the "From" combobox and select "Bookmarks HTML File" item. That should uncheck and disable all the checkboxes but "Favorites/Bookmarks" and present a "Choose file" button in the place where "Import" button was. Click on that new button and select your bookmarks html file, once you do that the import process should start, and if you file is ok, chrome should import and present you with a success message. BUG=80685 R=dbeam@chromium.org, isherman@chromium.org Review URL: https://codereview.chromium.org/22332003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@216860 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/importer')
-rw-r--r--chrome/browser/importer/importer_list.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/chrome/browser/importer/importer_list.cc b/chrome/browser/importer/importer_list.cc
index 1863d4a..598843e 100644
--- a/chrome/browser/importer/importer_list.cc
+++ b/chrome/browser/importer/importer_list.cc
@@ -175,6 +175,12 @@ 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->services_supported = importer::FAVORITES;
+ profiles.push_back(bookmarks_file);
// TODO(jhawkins): Remove this condition once DetectSourceProfilesHack is
// removed.