diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-19 21:14:50 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-19 21:14:50 +0000 |
| commit | c96d2673e03f87d0a39efe047df517a87fdd9ec7 (patch) | |
| tree | 75e2362bcae09b90598fa2c17a19c6ad5c9306bf /chrome/profile_import | |
| parent | 041591e177a759271eaf6b334a87f678bb2e9d62 (diff) | |
| download | chromium_src-c96d2673e03f87d0a39efe047df517a87fdd9ec7.zip chromium_src-c96d2673e03f87d0a39efe047df517a87fdd9ec7.tar.gz chromium_src-c96d2673e03f87d0a39efe047df517a87fdd9ec7.tar.bz2 | |
Revert 56742 - 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
TBR=brettw@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56754 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/profile_import')
| -rw-r--r-- | chrome/profile_import/profile_import_thread.cc | 6 | ||||
| -rw-r--r-- | chrome/profile_import/profile_import_thread.h | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/chrome/profile_import/profile_import_thread.cc b/chrome/profile_import/profile_import_thread.cc index 6f097b3..e9ba2a5 100644 --- a/chrome/profile_import/profile_import_thread.cc +++ b/chrome/profile_import/profile_import_thread.cc @@ -105,8 +105,7 @@ void ProfileImportThread::NotifyEnded() { } void ProfileImportThread::NotifyHistoryImportReady( - const std::vector<history::URLRow> &rows, - history::VisitSource visit_source) { + const std::vector<history::URLRow> &rows) { Send(new ProfileImportProcessHostMsg_NotifyHistoryImportStart(rows.size())); std::vector<history::URLRow>::const_iterator it; @@ -118,8 +117,7 @@ void ProfileImportThread::NotifyHistoryImportReady( it + kNumHistoryRowsToSend : rows.end(); row_group.assign(it, end_group); - Send(new ProfileImportProcessHostMsg_NotifyHistoryImportGroup(row_group, - visit_source)); + Send(new ProfileImportProcessHostMsg_NotifyHistoryImportGroup(row_group)); } } diff --git a/chrome/profile_import/profile_import_thread.h b/chrome/profile_import/profile_import_thread.h index f780cc5..47f2015 100644 --- a/chrome/profile_import/profile_import_thread.h +++ b/chrome/profile_import/profile_import_thread.h @@ -42,8 +42,7 @@ class ProfileImportThread : public ChildThread { void NotifyEnded(); // Bridging methods that move data back across the process boundary. - void NotifyHistoryImportReady(const std::vector<history::URLRow> &rows, - history::VisitSource visit_source); + void NotifyHistoryImportReady(const std::vector<history::URLRow> &rows); void NotifyHomePageImportReady(const GURL& home_page); void NotifyBookmarksImportReady( const std::vector<ProfileWriter::BookmarkEntry>& bookmarks, |