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

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

Issue 2802973003: Remove ScopedVector from chrome/ (Closed)
Patch Set: Created 3 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 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 21 matching lines...) Expand all
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_) {
42 hfs_.reset(new HFSIterator(partitions_[current_partition_])); 42 hfs_.reset(new HFSIterator(partitions_[current_partition_].get()));
43 if (!hfs_->Open()) 43 if (!hfs_->Open())
44 continue; 44 continue;
45 } 45 }
46 46
47 // Iterate through the HFS filesystem until a concrete file is found. 47 // Iterate through the HFS filesystem until a concrete file is found.
48 while (true) { 48 while (true) {
49 if (!hfs_->Next()) 49 if (!hfs_->Next())
50 break; 50 break;
51 51
52 // Skip directories and symlinks. 52 // Skip directories and symlinks.
(...skipping 21 matching lines...) Expand all
74 base::string16 DMGIterator::GetPath() { 74 base::string16 DMGIterator::GetPath() {
75 return hfs_->GetPath(); 75 return hfs_->GetPath();
76 } 76 }
77 77
78 std::unique_ptr<ReadStream> DMGIterator::GetReadStream() { 78 std::unique_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

Powered by Google App Engine
This is Rietveld 408576698