trunk/src/webkit/fileapi/isolated_mount_point_provider.h - Issue 15292007: Revert 200828 "Move webkit/fileapi/file_system_mount_point_provi..."

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: trunk/src/webkit/fileapi/isolated_mount_point_provider.h

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/file_system_mount_point_provider_unittest.cc ('k') | trunk/src/webkit/fileapi/local_file_system_cross_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/isolated_mount_point_provider.h: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 #ifndef WEBKIT_FILEAPI_ISOLATED_MOUNT_POINT_PROVIDER_H_	5 #ifndef WEBKIT_FILEAPI_ISOLATED_MOUNT_POINT_PROVIDER_H_

6 #define WEBKIT_FILEAPI_ISOLATED_MOUNT_POINT_PROVIDER_H_	6 #define WEBKIT_FILEAPI_ISOLATED_MOUNT_POINT_PROVIDER_H_

7	7

8 #include "base/memory/scoped_ptr.h"	8 #include "base/memory/scoped_ptr.h"

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

10	10

11 namespace fileapi {	11 namespace fileapi {

12	12

13 class AsyncFileUtilAdapter;	13 class AsyncFileUtilAdapter;

14	14

15 class IsolatedMountPointProvider : public FileSystemMountPointProvider {	15 class IsolatedMountPointProvider : public FileSystemMountPointProvider {

16 public:	16 public:

17 IsolatedMountPointProvider();	17 IsolatedMountPointProvider();

18 virtual ~IsolatedMountPointProvider();	18 virtual ~IsolatedMountPointProvider();

19	19

(...skipping 40 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
60	60

61 private:	61 private:

62 scoped_ptr<AsyncFileUtilAdapter> isolated_file_util_;	62 scoped_ptr<AsyncFileUtilAdapter> isolated_file_util_;

63 scoped_ptr<AsyncFileUtilAdapter> dragged_file_util_;	63 scoped_ptr<AsyncFileUtilAdapter> dragged_file_util_;

64 scoped_ptr<AsyncFileUtilAdapter> transient_file_util_;	64 scoped_ptr<AsyncFileUtilAdapter> transient_file_util_;

65 };	65 };

66	66

67 } // namespace fileapi	67 } // namespace fileapi

68	68

69 #endif // WEBKIT_FILEAPI_ISOLATED_MOUNT_POINT_PROVIDER_H_	69 #endif // WEBKIT_FILEAPI_ISOLATED_MOUNT_POINT_PROVIDER_H_

OLD	NEW