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>2012-03-27 03:03:27 +0000
committermichaelbai@chromium.org <michaelbai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-27 03:03:27 +0000
commitd1645e5e3ceea4aad45f5c567fe0c1ce65f4d0fb (patch)
tree208a83f923993eac5526bf4c39c3fdbfe92a6250 /chrome/browser/history/thumbnail_database.cc
parent9ec4be8fef87de672f9741ac85a921510ad9da20 (diff)
downloadchromium_src-d1645e5e3ceea4aad45f5c567fe0c1ce65f4d0fb.zip
chromium_src-d1645e5e3ceea4aad45f5c567fe0c1ce65f4d0fb.tar.gz
chromium_src-d1645e5e3ceea4aad45f5c567fe0c1ce65f4d0fb.tar.bz2
The AndroidProviderBackend Part 1.
The main class to implement android content provider. This CL is the implementation of Bookmark part. It doesn't include Search related API. BUG= TEST= Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=129036 Review URL: http://codereview.chromium.org/9704077 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@129116 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/history/thumbnail_database.cc')
-rw-r--r--chrome/browser/history/thumbnail_database.cc7
1 files changed, 6 insertions, 1 deletions
diff --git a/chrome/browser/history/thumbnail_database.cc b/chrome/browser/history/thumbnail_database.cc
index b316f6f..9e037c7 100644
--- a/chrome/browser/history/thumbnail_database.cc
+++ b/chrome/browser/history/thumbnail_database.cc
@@ -246,6 +246,10 @@ void ThumbnailDatabase::CommitTransaction() {
db_.CommitTransaction();
}
+void ThumbnailDatabase::RollbackTransaction() {
+ db_.RollbackTransaction();
+}
+
void ThumbnailDatabase::Vacuum() {
DCHECK(db_.transaction_nesting() == 0) <<
"Can not have a transaction when vacuuming.";
@@ -420,7 +424,8 @@ bool ThumbnailDatabase::GetFavicon(
if (!statement.Step())
return false; // No entry for the id.
- *last_updated = base::Time::FromTimeT(statement.ColumnInt64(0));
+ if (last_updated)
+ *last_updated = base::Time::FromTimeT(statement.ColumnInt64(0));
if (statement.ColumnByteLength(1) > 0)
statement.ColumnBlobAsVector(1, png_icon_data);
if (icon_url)