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

Side by Side Diff: chrome/utility/safe_browsing/mac/dmg_iterator.cc

Issue 1579863003: Convert Pass()→std::move() for Mac build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/utility/safe_browsing/mac/dmg_iterator.h" 5 #include "chrome/utility/safe_browsing/mac/dmg_iterator.h"
6 6
7 #include "chrome/utility/safe_browsing/mac/hfs.h" 7 #include "chrome/utility/safe_browsing/mac/hfs.h"
8 #include "chrome/utility/safe_browsing/mac/read_stream.h" 8 #include "chrome/utility/safe_browsing/mac/read_stream.h"
9 9
10 namespace safe_browsing { 10 namespace safe_browsing {
(...skipping 10 matching lines...) Expand all
21 21
22 bool DMGIterator::Open() { 22 bool DMGIterator::Open() {
23 if (!udif_.Parse()) 23 if (!udif_.Parse())
24 return false; 24 return false;
25 25
26 // Collect all the HFS partitions up-front. The data are accessed lazily, so 26 // Collect all the HFS partitions up-front. The data are accessed lazily, so
27 // this is relatively inexpensive. 27 // this is relatively inexpensive.
28 for (size_t i = 0; i < udif_.GetNumberOfPartitions(); ++i) { 28 for (size_t i = 0; i < udif_.GetNumberOfPartitions(); ++i) {
29 if (udif_.GetPartitionType(i) == "Apple_HFS" || 29 if (udif_.GetPartitionType(i) == "Apple_HFS" ||
30 udif_.GetPartitionType(i) == "Apple_HFSX") { 30 udif_.GetPartitionType(i) == "Apple_HFSX") {
31 partitions_.push_back(udif_.GetPartitionReadStream(i).Pass()); 31 partitions_.push_back(udif_.GetPartitionReadStream(i));
32 } 32 }
33 } 33 }
34 34
35 return partitions_.size() > 0; 35 return partitions_.size() > 0;
36 } 36 }
37 37
38 bool DMGIterator::Next() { 38 bool DMGIterator::Next() {
39 // Iterate through all the HFS partitions in the DMG file. 39 // Iterate through all the HFS partitions in the DMG file.
40 for (; current_partition_ < partitions_.size(); ++current_partition_) { 40 for (; current_partition_ < partitions_.size(); ++current_partition_) {
41 if (!hfs_) { 41 if (!hfs_) {
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 base::string16 DMGIterator::GetPath() { 74 base::string16 DMGIterator::GetPath() {
75 return hfs_->GetPath(); 75 return hfs_->GetPath();
76 } 76 }
77 77
78 scoped_ptr<ReadStream> DMGIterator::GetReadStream() { 78 scoped_ptr<ReadStream> DMGIterator::GetReadStream() {
79 return hfs_->GetReadStream(); 79 return hfs_->GetReadStream();
80 } 80 }
81 81
82 } // namespace dmg 82 } // namespace dmg
83 } // namespace safe_browsing 83 } // namespace safe_browsing
OLDNEW
« no previous file with comments | « chrome/utility/media_galleries/picasa_album_table_reader_unittest.cc ('k') | chrome/utility/safe_browsing/mac/udif.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698