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

Unified Diff: chrome/browser/themes/browser_theme_pack.cc

Issue 10272004: Move RefCountedMemory class 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 | « chrome/browser/themes/browser_theme_pack.h ('k') | chrome/browser/themes/theme_service.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/themes/browser_theme_pack.cc
===================================================================
--- chrome/browser/themes/browser_theme_pack.cc (revision 134496)
+++ chrome/browser/themes/browser_theme_pack.cc (working copy)
@@ -287,7 +287,7 @@
};
// Returns a piece of memory with the contents of the file |path|.
-RefCountedMemory* ReadFileData(const FilePath& path) {
+base::RefCountedMemory* ReadFileData(const FilePath& path) {
if (!path.empty()) {
net::FileStream file(NULL);
int flags = base::PLATFORM_FILE_OPEN | base::PLATFORM_FILE_READ;
@@ -528,7 +528,7 @@
if (image_iter != loaded_images_.end())
return image_iter->second;
- scoped_refptr<RefCountedMemory> memory;
+ scoped_refptr<base::RefCountedMemory> memory;
if (data_pack_.get()) {
memory = data_pack_->GetStaticMemory(prs_id);
} else {
@@ -557,8 +557,8 @@
return NULL;
}
-RefCountedMemory* BrowserThemePack::GetRawData(int idr_id) const {
- RefCountedMemory* memory = NULL;
+base::RefCountedMemory* BrowserThemePack::GetRawData(int idr_id) const {
+ base::RefCountedMemory* memory = NULL;
int prs_id = GetPersistentIDByIDR(idr_id);
if (prs_id != -1) {
@@ -870,7 +870,7 @@
for (FilePathMap::const_iterator it = file_paths.begin();
it != file_paths.end(); ++it) {
- scoped_refptr<RefCountedMemory> raw_data(ReadFileData(it->second));
+ scoped_refptr<base::RefCountedMemory> raw_data(ReadFileData(it->second));
if (!raw_data.get()) {
LOG(ERROR) << "Could not load theme image";
return false;
« no previous file with comments | « chrome/browser/themes/browser_theme_pack.h ('k') | chrome/browser/themes/theme_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698