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

Unified Diff: chrome/browser/extensions/api/image_writer_private/write_from_file_operation.cc

Issue 149313003: Significantly cleans up the ImageWriter Operation class and subclasses. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixes cross-compilation and test issues. Created 6 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
Index: chrome/browser/extensions/api/image_writer_private/write_from_file_operation.cc
diff --git a/chrome/browser/extensions/api/image_writer_private/write_from_file_operation.cc b/chrome/browser/extensions/api/image_writer_private/write_from_file_operation.cc
index 65d845759a00190181f185827594be3f7b10aba4..09c56fd33ef414df472980bb180941fb1d4cbe27 100644
--- a/chrome/browser/extensions/api/image_writer_private/write_from_file_operation.cc
+++ b/chrome/browser/extensions/api/image_writer_private/write_from_file_operation.cc
@@ -15,25 +15,27 @@ using content::BrowserThread;
WriteFromFileOperation::WriteFromFileOperation(
base::WeakPtr<OperationManager> manager,
const ExtensionId& extension_id,
- const base::FilePath& path,
- const std::string& storage_unit_id)
- : Operation(manager, extension_id, storage_unit_id) {
- image_path_ = path;
+ const base::FilePath& user_file_path,
+ const std::string& device_path)
+ : Operation(manager, extension_id, device_path) {
+ image_path_ = user_file_path;
}
-WriteFromFileOperation::~WriteFromFileOperation() {
-}
-
-void WriteFromFileOperation::Start() {
- DVLOG(1) << "Starting file-to-usb write of " << image_path_.value()
- << " to " << storage_unit_id_;
+WriteFromFileOperation::~WriteFromFileOperation() {}
+void WriteFromFileOperation::StartImpl() {
if (!base::PathExists(image_path_) || base::DirectoryExists(image_path_)) {
+ DLOG(ERROR) << "Source must exist and not be a directory.";
Error(error::kImageInvalid);
return;
}
- WriteStart();
+ Unzip(base::Bind(
+ &WriteFromFileOperation::Write,
+ this,
+ base::Bind(&WriteFromFileOperation::VerifyWrite,
+ this,
+ base::Bind(&WriteFromFileOperation::Finish, this))));
}
} // namespace image_writer

Powered by Google App Engine
This is Rietveld 408576698