trunk/src/webkit/fileapi/local_file_system_operation.cc - Issue 15292007: Revert 200828 "Move webkit/fileapi/file_system_mount_point_provi..."

Side by Side Diff: trunk/src/webkit/fileapi/local_file_system_operation.cc

Issue 15292007: Revert 200828 "Move webkit/fileapi/file_system_mount_point_provi..." (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: Created 7 years, 7 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 | Annotate | Revision Log

« no previous file with comments | « trunk/src/webkit/fileapi/local_file_system_cross_operation_unittest.cc ('k') | trunk/src/webkit/fileapi/local_file_system_operation_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Property Changes:

Added: svn:mergeinfo
Merged /branches/chrome_webkit_merge_branch/src/webkit/fileapi/local_file_system_operation.cc:r3734-4217,4606-5108,5177-5263

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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 "webkit/fileapi/local_file_system_operation.h"	5 #include "webkit/fileapi/local_file_system_operation.h"

6	6

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

8 #include "base/single_thread_task_runner.h"	8 #include "base/single_thread_task_runner.h"

9 #include "base/time.h"	9 #include "base/time.h"

10 #include "base/utf_string_conversions.h"	10 #include "base/utf_string_conversions.h"

11 #include "net/base/escape.h"	11 #include "net/base/escape.h"

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

13 #include "webkit/blob/shareable_file_reference.h"	13 #include "webkit/blob/shareable_file_reference.h"

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

15 #include "webkit/fileapi/async_file_util.h"	14 #include "webkit/fileapi/async_file_util.h"

16 #include "webkit/fileapi/cross_operation_delegate.h"	15 #include "webkit/fileapi/cross_operation_delegate.h"

17 #include "webkit/fileapi/file_observers.h"	16 #include "webkit/fileapi/file_observers.h"

18 #include "webkit/fileapi/file_system_context.h"	17 #include "webkit/fileapi/file_system_context.h"

19 #include "webkit/fileapi/file_system_file_util.h"	18 #include "webkit/fileapi/file_system_file_util.h"

	19 #include "webkit/fileapi/file_system_mount_point_provider.h"

20 #include "webkit/fileapi/file_system_operation_context.h"	20 #include "webkit/fileapi/file_system_operation_context.h"

21 #include "webkit/fileapi/file_system_task_runners.h"	21 #include "webkit/fileapi/file_system_task_runners.h"

22 #include "webkit/fileapi/file_system_types.h"	22 #include "webkit/fileapi/file_system_types.h"

23 #include "webkit/fileapi/file_system_url.h"	23 #include "webkit/fileapi/file_system_url.h"

24 #include "webkit/fileapi/file_system_util.h"	24 #include "webkit/fileapi/file_system_util.h"

25 #include "webkit/fileapi/file_writer_delegate.h"	25 #include "webkit/fileapi/file_writer_delegate.h"

26 #include "webkit/fileapi/remove_operation_delegate.h"	26 #include "webkit/fileapi/remove_operation_delegate.h"

27 #include "webkit/fileapi/sandbox_file_stream_writer.h"	27 #include "webkit/fileapi/sandbox_file_stream_writer.h"

28 #include "webkit/quota/quota_manager.h"	28 #include "webkit/quota/quota_manager.h"

29 #include "webkit/quota/quota_types.h"	29 #include "webkit/quota/quota_types.h"

(...skipping 842 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
872 }	872 }

873	873

874 bool LocalFileSystemOperation::SetPendingOperationType(OperationType type) {	874 bool LocalFileSystemOperation::SetPendingOperationType(OperationType type) {

875 if (pending_operation_ != kOperationNone)	875 if (pending_operation_ != kOperationNone)

876 return false;	876 return false;

877 pending_operation_ = type;	877 pending_operation_ = type;

878 return true;	878 return true;

879 }	879 }

880	880

881 } // namespace fileapi	881 } // namespace fileapi

OLD	NEW