Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(104)

Unified Diff: chrome/browser/history/android/android_history_types.h

Issue 10857065: Revert 152162 - Change HistoryAndBookmarkRow favicon_ field to be scoped_refptr<base::RefCountedMem… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/history/android/android_provider_backend.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/history/android/android_history_types.h
===================================================================
--- chrome/browser/history/android/android_history_types.h (revision 152168)
+++ chrome/browser/history/android/android_history_types.h (working copy)
@@ -117,18 +117,14 @@
}
// The favicon related to page if any.
- void set_favicon(const scoped_refptr<base::RefCountedMemory>& data) {
+ void set_favicon(const std::vector<unsigned char>& data) {
set_value_explicitly(FAVICON);
favicon_ = data;
}
- const scoped_refptr<base::RefCountedMemory>& favicon() const {
+ const std::vector<unsigned char>& 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);
@@ -172,7 +168,7 @@
string16 title_;
base::Time created_;
base::Time last_visit_time_;
- scoped_refptr<base::RefCountedMemory> favicon_;
+ std::vector<unsigned char> favicon_;
int visit_count_;
bool is_bookmark_;
int64 parent_id_;
« no previous file with comments | « no previous file | chrome/browser/history/android/android_provider_backend.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698