chrome/browser/sync_file_system/local/syncable_file_system_operation.cc - Issue 559063002: Remove webkit/browser/, point everything to storage/browser/ instead

Side by Side Diff: chrome/browser/sync_file_system/local/syncable_file_system_operation.cc

Issue 559063002: Remove webkit/browser/, point everything to storage/browser/ instead (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: clean up DEPS per feedback Created 6 years, 3 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

« no previous file with comments | « chrome/browser/sync_file_system/local/syncable_file_system_operation.h ('k') | chrome/browser/sync_file_system/local/syncable_file_system_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 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/browser/sync_file_system/local/syncable_file_system_operation.h "	5 #include "chrome/browser/sync_file_system/local/syncable_file_system_operation.h "

6	6

7 #include "base/logging.h"	7 #include "base/logging.h"

8 #include "chrome/browser/sync_file_system/local/local_file_sync_context.h"	8 #include "chrome/browser/sync_file_system/local/local_file_sync_context.h"

9 #include "chrome/browser/sync_file_system/local/sync_file_system_backend.h"	9 #include "chrome/browser/sync_file_system/local/sync_file_system_backend.h"

10 #include "chrome/browser/sync_file_system/local/syncable_file_operation_runner.h "	10 #include "chrome/browser/sync_file_system/local/syncable_file_operation_runner.h "

11 #include "chrome/browser/sync_file_system/syncable_file_system_util.h"	11 #include "chrome/browser/sync_file_system/syncable_file_system_util.h"

12 #include "net/url_request/url_request.h"	12 #include "net/url_request/url_request.h"

	13 #include "storage/browser/fileapi/file_system_context.h"

	14 #include "storage/browser/fileapi/file_system_operation.h"

	15 #include "storage/browser/fileapi/file_system_operation_context.h"

	16 #include "storage/browser/fileapi/file_system_url.h"

	17 #include "storage/browser/fileapi/file_writer_delegate.h"

13 #include "storage/common/blob/shareable_file_reference.h"	18 #include "storage/common/blob/shareable_file_reference.h"

14 #include "webkit/browser/fileapi/file_system_context.h"

15 #include "webkit/browser/fileapi/file_system_operation.h"

16 #include "webkit/browser/fileapi/file_system_operation_context.h"

17 #include "webkit/browser/fileapi/file_system_url.h"

18 #include "webkit/browser/fileapi/file_writer_delegate.h"

19	19

20 using storage::FileSystemURL;	20 using storage::FileSystemURL;

21	21

22 namespace sync_file_system {	22 namespace sync_file_system {

23	23

24 namespace {	24 namespace {

25	25

26 void WriteCallbackAdapter(	26 void WriteCallbackAdapter(

27 const SyncableFileSystemOperation::WriteCallback& callback,	27 const SyncableFileSystemOperation::WriteCallback& callback,

28 base::File::Error status) {	28 base::File::Error status) {

(...skipping 360 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
389 operation_runner_->OnOperationCompleted(target_paths_);	389 operation_runner_->OnOperationCompleted(target_paths_);

390 callback.Run(result, bytes, complete);	390 callback.Run(result, bytes, complete);

391 }	391 }

392	392

393 void SyncableFileSystemOperation::OnCancelled() {	393 void SyncableFileSystemOperation::OnCancelled() {

394 DCHECK(!completion_callback_.is_null());	394 DCHECK(!completion_callback_.is_null());

395 completion_callback_.Run(base::File::FILE_ERROR_ABORT);	395 completion_callback_.Run(base::File::FILE_ERROR_ABORT);

396 }	396 }

397	397

398 } // namespace sync_file_system	398 } // namespace sync_file_system

OLD	NEW