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

Unified Diff: chrome/browser/ui/webui/favicon_source.cc

Issue 16290004: 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: 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/ui/webui/favicon_source.cc
diff --git a/chrome/browser/ui/webui/favicon_source.cc b/chrome/browser/ui/webui/favicon_source.cc
index 0552d874ecdbc5ae58e503e858e741c326b63bf5..b71df5df6a294bbbfaf77b80c3e611671ef2238e 100644
--- a/chrome/browser/ui/webui/favicon_source.cc
+++ b/chrome/browser/ui/webui/favicon_source.cc
@@ -271,7 +271,7 @@ void FaviconSource::OnFaviconDataAvailable(
const chrome::FaviconBitmapResult& bitmap_result) {
if (bitmap_result.is_valid()) {
// Forward the data along to the networking system.
- request.callback.Run(bitmap_result.bitmap_data);
+ request.callback.Run(bitmap_result.bitmap_data.get());
} else if (!HandleMissingResource(request)) {
SendDefaultResponse(request);
}
@@ -300,7 +300,8 @@ void FaviconSource::SendDefaultResponse(const IconRequest& icon_request) {
resource_id = IDR_DEFAULT_FAVICON;
break;
}
- base::RefCountedMemory* default_favicon = default_favicons_[favicon_index];
+ base::RefCountedMemory* default_favicon =
+ default_favicons_[favicon_index].get();
if (!default_favicon) {
ui::ScaleFactor scale_factor = icon_request.scale_factor;
« no previous file with comments | « chrome/browser/ui/webui/extensions/pack_extension_handler.cc ('k') | chrome/browser/ui/webui/feedback_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698