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

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

Issue 1539583003: Convert Pass()→std::move() in ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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_unittest.cc ('k') | ui/compositor/compositor.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
diff --git a/ui/base/resource/resource_bundle.cc b/ui/base/resource/resource_bundle.cc
index 5b45c34521650fe553126f9a3567836c0248deb8..d64f013ff96d1f72911bc865278f699b572a16e1 100644
--- a/ui/base/resource/resource_bundle.cc
+++ b/ui/base/resource/resource_bundle.cc
@@ -5,6 +5,7 @@
#include "ui/base/resource/resource_bundle.h"
#include <limits>
+#include <utility>
#include <vector>
#include "base/big_endian.h"
@@ -177,7 +178,7 @@ void ResourceBundle::InitSharedInstanceWithPakFileRegion(
const base::MemoryMappedFile::Region& region) {
InitSharedInstance(NULL);
scoped_ptr<DataPack> data_pack(new DataPack(SCALE_FACTOR_100P));
- if (!data_pack->LoadFromFileRegion(pak_file.Pass(), region)) {
+ if (!data_pack->LoadFromFileRegion(std::move(pak_file), region)) {
NOTREACHED() << "failed to load pak file";
return;
}
@@ -243,8 +244,9 @@ void ResourceBundle::AddOptionalMaterialDesignDataPackFromPath(
void ResourceBundle::AddDataPackFromFile(base::File file,
ScaleFactor scale_factor) {
- AddDataPackFromFileRegion(
- file.Pass(), base::MemoryMappedFile::Region::kWholeFile, scale_factor);
+ AddDataPackFromFileRegion(std::move(file),
+ base::MemoryMappedFile::Region::kWholeFile,
+ scale_factor);
}
void ResourceBundle::AddDataPackFromFileRegion(
@@ -253,7 +255,7 @@ void ResourceBundle::AddDataPackFromFileRegion(
ScaleFactor scale_factor) {
scoped_ptr<DataPack> data_pack(
new DataPack(scale_factor));
- if (data_pack->LoadFromFileRegion(file.Pass(), region)) {
+ if (data_pack->LoadFromFileRegion(std::move(file), region)) {
AddDataPack(data_pack.release());
} else {
LOG(ERROR) << "Failed to load data pack from file."
« no previous file with comments | « ui/base/resource/data_pack_unittest.cc ('k') | ui/compositor/compositor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698