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

Unified Diff: chrome/browser/history/top_sites_impl.cc

Issue 16296002: Update chrome/ to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 years, 7 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
Index: chrome/browser/history/top_sites_impl.cc
diff --git a/chrome/browser/history/top_sites_impl.cc b/chrome/browser/history/top_sites_impl.cc
index 9915d03ca04ea7b1135c7a71442c00d77fa80130..bc6e110c375e4782fd66422edd1847b5ac657154 100644
--- a/chrome/browser/history/top_sites_impl.cc
+++ b/chrome/browser/history/top_sites_impl.cc
@@ -226,11 +226,11 @@ bool TopSitesImpl::SetPageThumbnail(const GURL& url,
// Always remove the existing entry and then add it back. That way if we end
// up with too many temp thumbnails we'll prune the oldest first.
RemoveTemporaryThumbnailByURL(url);
- AddTemporaryThumbnail(url, thumbnail_data, score);
+ AddTemporaryThumbnail(url, thumbnail_data.get(), score);
return true;
}
- return SetPageThumbnailEncoded(url, thumbnail_data, score);
+ return SetPageThumbnailEncoded(url, thumbnail_data.get(), score);
}
bool TopSitesImpl::SetPageThumbnailToJPEGBytes(
@@ -369,9 +369,8 @@ void TopSitesImpl::FinishHistoryMigration(const ThumbnailMigration& data) {
URLToThumbnailMap::const_iterator image_i =
data.url_to_thumbnail_map.find(data.most_visited[i].url);
if (image_i != data.url_to_thumbnail_map.end()) {
- SetPageThumbnailEncoded(data.most_visited[i].url,
- image_i->second,
- ThumbnailScore());
+ SetPageThumbnailEncoded(
+ data.most_visited[i].url, image_i->second.get(), ThumbnailScore());
}
}
@@ -793,9 +792,8 @@ void TopSitesImpl::SetTopSites(const MostVisitedURLList& new_top_sites) {
for (TempImages::iterator it = temp_images_.begin();
it != temp_images_.end(); ++it) {
if (canonical_url == cache_->GetCanonicalURL(it->first)) {
- SetPageThumbnailEncoded(mv.url,
- it->second.thumbnail,
- it->second.thumbnail_score);
+ SetPageThumbnailEncoded(
+ mv.url, it->second.thumbnail.get(), it->second.thumbnail_score);
temp_images_.erase(it);
break;
}
« no previous file with comments | « chrome/browser/history/in_memory_url_index_unittest.cc ('k') | chrome/browser/history/top_sites_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698