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

Side by Side Diff: chrome/utility/image_writer/image_writer.h

Issue 1899083002: Convert //chrome from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #ifndef CHROME_UTILITY_IMAGE_WRITER_IMAGE_WRITER_H_ 5 #ifndef CHROME_UTILITY_IMAGE_WRITER_IMAGE_WRITER_H_
6 #define CHROME_UTILITY_IMAGE_WRITER_IMAGE_WRITER_H_ 6 #define CHROME_UTILITY_IMAGE_WRITER_IMAGE_WRITER_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory>
10 #include <vector> 11 #include <vector>
11 12
12 #include "base/bind.h" 13 #include "base/bind.h"
13 #include "base/callback.h" 14 #include "base/callback.h"
14 #include "base/files/file.h" 15 #include "base/files/file.h"
15 #include "base/files/file_path.h" 16 #include "base/files/file_path.h"
16 #include "base/memory/scoped_ptr.h"
17 #include "base/memory/weak_ptr.h" 17 #include "base/memory/weak_ptr.h"
18 #include "build/build_config.h" 18 #include "build/build_config.h"
19 19
20 #if defined(OS_WIN) 20 #if defined(OS_WIN)
21 #include <windows.h> 21 #include <windows.h>
22 #endif 22 #endif
23 23
24 namespace image_writer { 24 namespace image_writer {
25 25
26 class ImageWriterHandler; 26 class ImageWriterHandler;
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 base::File device_file_; 81 base::File device_file_;
82 int64_t bytes_processed_; 82 int64_t bytes_processed_;
83 bool running_; 83 bool running_;
84 84
85 #if defined(OS_WIN) 85 #if defined(OS_WIN)
86 std::vector<HANDLE> volume_handles_; 86 std::vector<HANDLE> volume_handles_;
87 #endif 87 #endif
88 88
89 #if defined(OS_MACOSX) 89 #if defined(OS_MACOSX)
90 friend class DiskUnmounterMac; 90 friend class DiskUnmounterMac;
91 scoped_ptr<DiskUnmounterMac> unmounter_; 91 std::unique_ptr<DiskUnmounterMac> unmounter_;
92 #endif 92 #endif
93 93
94 ImageWriterHandler* handler_; 94 ImageWriterHandler* handler_;
95 }; 95 };
96 96
97 } // namespace image_writer 97 } // namespace image_writer
98 98
99 #endif // CHROME_UTILITY_IMAGE_WRITER_IMAGE_WRITER_H_ 99 #endif // CHROME_UTILITY_IMAGE_WRITER_IMAGE_WRITER_H_
OLDNEW
« no previous file with comments | « chrome/utility/image_writer/disk_unmounter_mac.cc ('k') | chrome/utility/image_writer/image_writer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698