summaryrefslogtreecommitdiffstats
path: root/chrome/browser/importer/mork_reader.cc
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-21 02:21:11 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-21 02:21:11 +0000
commit5989f1a45c9163d59ef4009ea1d7708114744900 (patch)
tree2b3ee0ab7cfb87a730db83b647336a0eebdc789c /chrome/browser/importer/mork_reader.cc
parent518ef5cc41db9ed09acb4e9df7ded8ab4f01e8f5 (diff)
downloadchromium_src-5989f1a45c9163d59ef4009ea1d7708114744900.zip
chromium_src-5989f1a45c9163d59ef4009ea1d7708114744900.tar.gz
chromium_src-5989f1a45c9163d59ef4009ea1d7708114744900.tar.bz2
Re-land r56742 now with correct database files
A new field to describe the sources of history urls(visits) is added. This field is recorded in visit_database. So far, it can tell imported, synchronized, entension added or other(mainly testing) entries from user browsed entries. In the future, history extension API may allow queries to combinate with this criterion. BUG=none TEST=Unit tests are already included. Please test the web browser with history from previous versions to make sure the migration could be done properly. Also try to import or sync some history and inspect the sources added to the visit_source table in hitory database are correct. Original review: http://codereview.chromium.org/2906004/show Patch by weili@google.com git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56971 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/importer/mork_reader.cc')
-rw-r--r--chrome/browser/importer/mork_reader.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/importer/mork_reader.cc b/chrome/browser/importer/mork_reader.cc
index 4207ad6..ce1ffe8 100644
--- a/chrome/browser/importer/mork_reader.cc
+++ b/chrome/browser/importer/mork_reader.cc
@@ -584,5 +584,5 @@ void ImportHistoryFromFirefox2(const FilePath& file, ImporterBridge* bridge) {
for (MorkReader::iterator i = reader.begin(); i != reader.end(); ++i)
AddToHistory(i->second, data, &rows);
if (!rows.empty())
- bridge->SetHistoryItems(rows);
+ bridge->SetHistoryItems(rows, history::SOURCE_FIREFOX_IMPORTED);
}