summaryrefslogtreecommitdiffstats
path: root/chrome/browser/history/thumbnail_database.h
diff options
context:
space:
mode:
authorarv@chromium.org <arv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-17 20:19:57 +0000
committerarv@chromium.org <arv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-17 20:19:57 +0000
commit790879f7d6faea44ef0d13c2f7b44fe74edafa5e (patch)
tree6d0210a7594a265ba97425289f0a0ac44aabfb62 /chrome/browser/history/thumbnail_database.h
parent36ea6c6f047abed672aa9af4f3071a7364142d64 (diff)
downloadchromium_src-790879f7d6faea44ef0d13c2f7b44fe74edafa5e.zip
chromium_src-790879f7d6faea44ef0d13c2f7b44fe74edafa5e.tar.gz
chromium_src-790879f7d6faea44ef0d13c2f7b44fe74edafa5e.tar.bz2
Change so that the extension favicon is read on the UI thread since extension objects should only be accessed on the UI thread.
This also fixes erg's todo to make favicons use RefCountedMemory instead of RefCountedBytes in all places. BUG=None TEST=None Review URL: http://codereview.chromium.org/1028001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41869 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/history/thumbnail_database.h')
-rw-r--r--chrome/browser/history/thumbnail_database.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/history/thumbnail_database.h b/chrome/browser/history/thumbnail_database.h
index 362edec..fb24357 100644
--- a/chrome/browser/history/thumbnail_database.h
+++ b/chrome/browser/history/thumbnail_database.h
@@ -10,11 +10,13 @@
#include "app/sql/connection.h"
#include "app/sql/init_status.h"
#include "app/sql/meta_table.h"
+#include "base/ref_counted.h"
#include "chrome/browser/history/history_types.h"
#include "chrome/browser/history/url_database.h" // For DBCloseScoper.
#include "chrome/browser/meta_table_helper.h"
class FilePath;
+class RefCountedMemory;
struct ThumbnailScore;
class SkBitmap;
@@ -88,7 +90,7 @@ class ThumbnailDatabase {
// The time indicates the access time, and is used to detect when the favicon
// should be refreshed.
bool SetFavIcon(FavIconID icon_id,
- const std::vector<unsigned char>& icon_data,
+ scoped_refptr<RefCountedMemory> icon_data,
base::Time time);
// Sets the time the favicon was last updated.