Index: chrome/browser/history/android/android_history_types.h |
diff --git a/chrome/browser/history/android/android_history_types.h b/chrome/browser/history/android/android_history_types.h |
index ea56399a10994d57140f85bc77416efdfa3b7e5a..843f465e53eb2ea0ee004a5fa46cc972bbdb9598 100644 |
--- a/chrome/browser/history/android/android_history_types.h |
+++ b/chrome/browser/history/android/android_history_types.h |
@@ -117,14 +117,18 @@ class HistoryAndBookmarkRow { |
} |
// The favicon related to page if any. |
- void set_favicon(const std::vector<unsigned char>& data) { |
+ void set_favicon(const scoped_refptr<base::RefCountedMemory>& data) { |
set_value_explicitly(FAVICON); |
favicon_ = data; |
} |
- const std::vector<unsigned char>& favicon() const { |
+ const scoped_refptr<base::RefCountedMemory>& favicon() const { |
return favicon_; |
} |
+ bool favicon_valid() const { |
+ return favicon_.get() && favicon_->size(); |
+ } |
+ |
// The id of android url. |
void set_id(AndroidURLID id) { |
set_value_explicitly(ID); |
@@ -168,7 +172,7 @@ class HistoryAndBookmarkRow { |
string16 title_; |
base::Time created_; |
base::Time last_visit_time_; |
- std::vector<unsigned char> favicon_; |
+ scoped_refptr<base::RefCountedMemory> favicon_; |
int visit_count_; |
bool is_bookmark_; |
int64 parent_id_; |