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

Unified Diff: ui/base/resource/data_pack.cc

Issue 12321062: base: Move MemoryMappedFile out of file_util.h and into its own header file. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix chrome_frame again Created 7 years, 10 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/data_pack.h ('k') | webkit/plugins/npapi/plugin_list_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/resource/data_pack.cc
diff --git a/ui/base/resource/data_pack.cc b/ui/base/resource/data_pack.cc
index 793e963c7c3c7c861dffa71767006b1df58552c2..4901a9b4e4a4ee3e632d7bf85bab024a7edfd6a5 100644
--- a/ui/base/resource/data_pack.cc
+++ b/ui/base/resource/data_pack.cc
@@ -7,6 +7,7 @@
#include <errno.h>
#include "base/file_util.h"
+#include "base/files/memory_mapped_file.h"
#include "base/logging.h"
#include "base/memory/ref_counted_memory.h"
#include "base/metrics/histogram.h"
@@ -72,7 +73,7 @@ DataPack::~DataPack() {
}
bool DataPack::LoadFromPath(const base::FilePath& path) {
- mmap_.reset(new file_util::MemoryMappedFile);
+ mmap_.reset(new base::MemoryMappedFile);
if (!mmap_->Initialize(path)) {
DLOG(ERROR) << "Failed to mmap datapack";
UMA_HISTOGRAM_ENUMERATION("DataPack.Load", INIT_FAILED,
@@ -84,7 +85,7 @@ bool DataPack::LoadFromPath(const base::FilePath& path) {
}
bool DataPack::LoadFromFile(base::PlatformFile file) {
- mmap_.reset(new file_util::MemoryMappedFile);
+ mmap_.reset(new base::MemoryMappedFile);
if (!mmap_->Initialize(file)) {
DLOG(ERROR) << "Failed to mmap datapack";
UMA_HISTOGRAM_ENUMERATION("DataPack.Load", INIT_FAILED_FROM_FILE,
« no previous file with comments | « ui/base/resource/data_pack.h ('k') | webkit/plugins/npapi/plugin_list_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698