summaryrefslogtreecommitdiffstats
path: root/chrome/browser/history/thumbnail_database.cc
diff options
context:
space:
mode:
authormichaelbai@chromium.org <michaelbai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-29 22:24:06 +0000
committermichaelbai@chromium.org <michaelbai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-29 22:24:06 +0000
commitd9b56385be3c099cf15a111a9be465c88fed6e6f (patch)
treeb2582f4766629ba60c3b26d6ee9a4d74b5ffe438 /chrome/browser/history/thumbnail_database.cc
parent4390888ce41374c7848345ddb0c37172e71162f1 (diff)
downloadchromium_src-d9b56385be3c099cf15a111a9be465c88fed6e6f.zip
chromium_src-d9b56385be3c099cf15a111a9be465c88fed6e6f.tar.gz
chromium_src-d9b56385be3c099cf15a111a9be465c88fed6e6f.tar.bz2
Init favicon db's meta table after migration.
BUG=105604 TEST=passed with existing tests Review URL: http://codereview.chromium.org/8725008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112051 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/history/thumbnail_database.cc')
-rw-r--r--chrome/browser/history/thumbnail_database.cc8
1 files changed, 8 insertions, 0 deletions
diff --git a/chrome/browser/history/thumbnail_database.cc b/chrome/browser/history/thumbnail_database.cc
index 2c752f8..82aed1a 100644
--- a/chrome/browser/history/thumbnail_database.cc
+++ b/chrome/browser/history/thumbnail_database.cc
@@ -709,6 +709,10 @@ bool ThumbnailDatabase::RenameAndDropThumbnails(const FilePath& old_db_file,
file_util::Delete(old_db_file, false);
+ meta_table_.Reset();
+ if (!meta_table_.Init(&db_, kCurrentVersionNumber, kCompatibleVersionNumber))
+ return false;
+
InitFaviconsIndex();
// Reopen the transaction.
@@ -768,6 +772,10 @@ IconMappingID ThumbnailDatabase::AddIconMapping(const GURL& page_url,
return db_.GetLastInsertRowId();
}
+bool ThumbnailDatabase::IsLatestVersion() {
+ return meta_table_.GetVersionNumber() == kCurrentVersionNumber;
+}
+
bool ThumbnailDatabase::UpgradeToVersion4() {
// Set the default icon type as favicon, so the current data are set
// correctly.