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

Unified Diff: ui/base/resource/resource_bundle.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
Download patch
« no previous file with comments | « ui/base/resource/resource_bundle.h ('k') | ui/base/resource/resource_bundle_gtk.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/resource/resource_bundle.cc
===================================================================
--- ui/base/resource/resource_bundle.cc (revision 133676)
+++ ui/base/resource/resource_bundle.cc (working copy)
@@ -9,6 +9,7 @@
#include "base/command_line.h"
#include "base/file_util.h"
#include "base/logging.h"
+#include "base/memory/ref_counted_memory.h"
#include "base/metrics/histogram.h"
#include "base/path_service.h"
#include "base/stl_util.h"
@@ -270,10 +271,10 @@
return GetNativeImageNamed(resource_id, RTL_DISABLED);
}
-RefCountedStaticMemory* ResourceBundle::LoadDataResourceBytes(
+base::RefCountedStaticMemory* ResourceBundle::LoadDataResourceBytes(
int resource_id) const {
for (size_t i = 0; i < data_packs_.size(); ++i) {
- RefCountedStaticMemory* bytes =
+ base::RefCountedStaticMemory* bytes =
data_packs_[i]->GetStaticMemory(resource_id);
if (bytes)
return bytes;
« no previous file with comments | « ui/base/resource/resource_bundle.h ('k') | ui/base/resource/resource_bundle_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698