diff options
| author | zmo@google.com <zmo@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-24 02:33:20 +0000 |
|---|---|---|
| committer | zmo@google.com <zmo@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-24 02:33:20 +0000 |
| commit | 5c88980fa29b793fbce68c9d89849ed1ed13321e (patch) | |
| tree | 08e5ae1eacf26b769a56197b0a70ecfc9616ad88 /chrome/browser/history/history_backend.cc | |
| parent | 8cd74da71a1d6ac754b3408c41ee40a41204e726 (diff) | |
| download | chromium_src-5c88980fa29b793fbce68c9d89849ed1ed13321e.zip chromium_src-5c88980fa29b793fbce68c9d89849ed1ed13321e.tar.gz chromium_src-5c88980fa29b793fbce68c9d89849ed1ed13321e.tar.bz2 | |
Revert 111378 - HQP Refactoring (in Preparation for SQLite Cache)
(See crbug.com/105340 for reverting reason and how to reproduce the issue locally)
1. Move ownership of the InMemoryURLIndex from the InMemoryHistoryBackend to the HistoryService, where it truly belongs.
2. Handle (by notification) URL visits, updates and deletes. Refactor use of NOTIFICATION_HISTORY_URLS_DELETED to provide the deleted URLRow so that row ID is available.
3. Correctly handle the adding and removing of page title words when a URL change is detected.
4. Other small cleanups.
BUG=96731, 92718
TEST=Unit tests updated.
TBR=atwilson (for profile_sync_service_typed_url_unittest.cc)
Previously reviewed as: http://codereview.chromium.org/8384024/
Review URL: http://codereview.chromium.org/8451009
TBR=mrossetti@chromium.org
Review URL: http://codereview.chromium.org/8662035
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111482 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/history/history_backend.cc')
| -rw-r--r-- | chrome/browser/history/history_backend.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/history/history_backend.cc b/chrome/browser/history/history_backend.cc index 540fab6..18cc3cb 100644 --- a/chrome/browser/history/history_backend.cc +++ b/chrome/browser/history/history_backend.cc @@ -9,6 +9,7 @@ #include <set> #include <vector> +#include "base/command_line.h" #include "base/compiler_specific.h" #include "base/file_util.h" #include "base/memory/scoped_ptr.h" @@ -217,7 +218,7 @@ HistoryBackend::~HistoryBackend() { DCHECK(!scheduled_commit_) << "Deleting without cleanup"; ReleaseDBTasks(); - // Close the databases before optionally running the "destroy" task. + // First close the databases before optionally running the "destroy" task. if (db_.get()) { // Commit the long-running transaction. db_->CommitTransaction(); @@ -884,7 +885,6 @@ void HistoryBackend::SetPageTitle(const GURL& url, if (row_id && row.title() != title) { row.set_title(title); db_->UpdateURLRow(row_id, row); - row.id_ = row_id; changed_urls.push_back(row); if (row.typed_count() > 0) typed_url_changed = true; |