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

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

Issue 61643015: Adds imageWriterPrivate support for Windows (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Reorganization and test updates. Created 7 years, 1 month 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/operation_linux.cc
diff --git a/chrome/browser/extensions/api/image_writer_private/operation_linux.cc b/chrome/browser/extensions/api/image_writer_private/operation_linux.cc
index 8250363a5488e1b2c0ea500b7640f8771d1c7df3..ec2247593571d046f8c3998fce86ddc7ad1d6643 100644
--- a/chrome/browser/extensions/api/image_writer_private/operation_linux.cc
+++ b/chrome/browser/extensions/api/image_writer_private/operation_linux.cc
@@ -9,15 +9,12 @@
#include "chrome/browser/extensions/api/image_writer_private/operation.h"
#include "chrome/browser/extensions/api/image_writer_private/operation_manager.h"
#include "content/public/browser/browser_thread.h"
-#include "third_party/zlib/google/zip.h"
namespace extensions {
namespace image_writer {
using content::BrowserThread;
-const int kBurningBlockSize = 8 * 1024; // 8 KiB
-
void Operation::WriteStart() {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
if (IsCancelled()) {
@@ -34,175 +31,13 @@ void Operation::WriteStart() {
SetStage(image_writer_api::STAGE_WRITE);
- // TODO (haven): Unmount partitions before writing. http://crbug.com/284834
-
- scoped_ptr<image_writer_utils::ImageReader> reader(
- new image_writer_utils::ImageReader());
- scoped_ptr<image_writer_utils::ImageWriter> writer(
- new image_writer_utils::ImageWriter());
base::FilePath storage_path(storage_unit_id_);
-
- if (reader->Open(image_path_)) {
- if (!writer->Open(storage_path)) {
- reader->Close();
- Error(error::kOpenDevice);
- return;
- }
- } else {
- Error(error::kOpenImage);
- return;
- }
-
- BrowserThread::PostTask(
- BrowserThread::FILE,
- FROM_HERE,
- base::Bind(&Operation::WriteChunk,
- this,
- base::Passed(&reader),
- base::Passed(&writer),
- 0));
-}
-
-void Operation::WriteChunk(
- scoped_ptr<image_writer_utils::ImageReader> reader,
- scoped_ptr<image_writer_utils::ImageWriter> writer,
- int64 bytes_written) {
- if (IsCancelled()) {
- WriteCleanUp(reader.Pass(), writer.Pass());
- return;
- }
-
- char buffer[kBurningBlockSize];
- int64 image_size = reader->GetSize();
- int len = reader->Read(buffer, kBurningBlockSize);
-
- if (len > 0) {
- if (writer->Write(buffer, len) == len) {
- int percent_prev = kProgressComplete * bytes_written / image_size;
- int percent_curr = kProgressComplete * (bytes_written + len) / image_size;
-
- if (percent_curr > percent_prev) {
- SetProgress(percent_curr);
- }
-
- BrowserThread::PostTask(
- BrowserThread::FILE,
- FROM_HERE,
- base::Bind(&Operation::WriteChunk,
- this,
- base::Passed(&reader),
- base::Passed(&writer),
- bytes_written + len));
- } else {
- WriteCleanUp(reader.Pass(), writer.Pass());
- Error(error::kWriteImage);
- }
- } else if (len == 0) {
- if (bytes_written == image_size) {
- if (WriteCleanUp(reader.Pass(), writer.Pass())) {
- BrowserThread::PostTask(
- BrowserThread::FILE,
- FROM_HERE,
- base::Bind(&Operation::WriteComplete,
- this));
- }
- } else {
- WriteCleanUp(reader.Pass(), writer.Pass());
- Error(error::kPrematureEndOfFile);
- }
- } else { // len < 0
- WriteCleanUp(reader.Pass(), writer.Pass());
- Error(error::kReadImage);
- }
-}
-
-bool Operation::WriteCleanUp(
- scoped_ptr<image_writer_utils::ImageReader> reader,
- scoped_ptr<image_writer_utils::ImageWriter> writer) {
-
- bool success = true;
- if (!reader->Close()) {
- Error(error::kCloseImage);
- success = false;
- }
-
- if (!writer->Close()) {
- Error(error::kCloseDevice);
- success = false;
- }
- return success;
-}
-
-void Operation::WriteComplete() {
-
- DVLOG(2) << "Completed write of " << image_path_.value();
- SetProgress(kProgressComplete);
-
- BrowserThread::PostTask(
- BrowserThread::FILE,
- FROM_HERE,
- base::Bind(&Operation::VerifyWriteStart,
- this));
-}
-
-void Operation::VerifyWriteStart() {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
- if (IsCancelled()) {
- return;
- }
-
- DVLOG(1) << "Starting verification stage.";
-
- SetStage(image_writer_api::STAGE_VERIFYWRITE);
-
- scoped_ptr<base::FilePath> image_path(new base::FilePath(image_path_));
-
- GetMD5SumOfFile(
- image_path.Pass(),
- -1,
- 0, // progress_offset
- 50, // progress_scale
- base::Bind(&Operation::VerifyWriteStage2,
- this));
-}
-
-void Operation::VerifyWriteStage2(
- scoped_ptr<std::string> image_hash) {
- DVLOG(1) << "Building MD5 sum of device: " << storage_unit_id_;
-
- int64 image_size;
- scoped_ptr<base::FilePath> device_path(new base::FilePath(storage_unit_id_));
-
- if (!file_util::GetFileSize(image_path_, &image_size)){
- Error(error::kImageSize);
- return;
- }
-
- GetMD5SumOfFile(
- device_path.Pass(),
- image_size,
- 50, // progress_offset
- 50, // progress_scale
- base::Bind(&Operation::VerifyWriteCompare,
- this,
- base::Passed(&image_hash)));
-}
-
-void Operation::VerifyWriteCompare(
- scoped_ptr<std::string> image_hash,
- scoped_ptr<std::string> device_hash) {
- DVLOG(1) << "Comparing hashes: " << *image_hash << " vs " << *device_hash;
-
- if (*image_hash != *device_hash) {
- Error(error::kWriteHash);
- return;
- }
-
- DVLOG(2) << "Completed write verification of " << image_path_.value();
-
- SetProgress(kProgressComplete);
-
- Finish();
+ scoped_refptr<base::MessageLoopProxy> task_runner =
+ BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE);
+ scoped_refptr<ImageWriter> image_writer(new ImageWriter(this,
+ image_path_,
+ storage_path));
+ image_writer->Start(task_runner);
}
} // namespace image_writer

Powered by Google App Engine
This is Rietveld 408576698