chrome/browser/icon_loader_chromeos.cc - Issue 10165020: Move RefCountedStaticMemory to base namespace - Code Review

Chromium Code Reviews

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

(237)

My Issues | Starred Open | Closed | All

Unified Diff: chrome/browser/icon_loader_chromeos.cc

Issue 10165020: Move RefCountedStaticMemory to base namespace (Closed) Base URL: http://src.chromium.org/svn/trunk/src/

Patch Set: Created 8 years, 8 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

« no previous file with comments | « base/memory/ref_counted_memory.cc ('k') | chrome/browser/printing/cloud_print/cloud_print_setup_source.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/icon_loader_chromeos.cc

===================================================================

--- chrome/browser/icon_loader_chromeos.cc (revision 133676)

+++ chrome/browser/icon_loader_chromeos.cc (working copy)

@@ -10,6 +10,7 @@

#include "base/bind.h"

#include "base/lazy_instance.h"

+#include "base/memory/ref_counted_memory.h"

#include "base/message_loop.h"

#include "chrome/browser/icon_loader.h"

#include "grit/component_extension_resources.h"

@@ -195,7 +196,8 @@

LAZY_INSTANCE_INITIALIZER;

int idr = icon_mapper.Get().Lookup(group_, icon_size_);

ResourceBundle& rb = ResourceBundle::GetSharedInstance();

- scoped_refptr<RefCountedStaticMemory> bytes(rb.LoadDataResourceBytes(idr));

+ scoped_refptr<base::RefCountedStaticMemory> bytes(

+ rb.LoadDataResourceBytes(idr));

DCHECK(bytes.get());

SkBitmap bitmap;

if (!gfx::PNGCodec::Decode(bytes->front(), bytes->size(), &bitmap))

« no previous file with comments | « base/memory/ref_counted_memory.cc ('k') | chrome/browser/printing/cloud_print/cloud_print_setup_source.cc » ('j') | no next file with comments »

Powered by Google App Engine

This is Rietveld 408576698